Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm
Modified Files:
Tag: ETERM-0_10
.cvsignore ChangeLog Eterm.spec autogen.sh configure.in
reformat-code
Log Message:
Mon Dec 5 13:33:58 2005 Michael Jennings (mej)
Merge and re-indent code.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -3 -r1.5 -r1.5.2.1
--- .cvsignore 10 Jan 2001 21:13:14 -0000 1.5
+++ .cvsignore 5 Dec 2005 18:33:32 -0000 1.5.2.1
@@ -11,7 +11,7 @@
config.status
config.h
libtool
-stamp-h
+stamp-h*
move-themes
*.spec
config.h.in
@@ -20,3 +20,8 @@
install-sh
Eterm*.tar.gz
*.sddf
+autom4te*
+depcomp
+build.mezz
+iconv_test*
+utf8*
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/ChangeLog,v
retrieving revision 1.278.2.33
retrieving revision 1.278.2.34
diff -u -3 -r1.278.2.33 -r1.278.2.34
--- ChangeLog 15 Mar 2005 22:32:12 -0000 1.278.2.33
+++ ChangeLog 5 Dec 2005 18:33:32 -0000 1.278.2.34
@@ -5379,3 +5379,131 @@
Big-ass merge.
----------------------------------------------------------------------
+Mon Apr 18 16:00:22 2005 Michael Jennings (mej)
+
+Remove unused NO_XLOCALE crap and do it right.
+----------------------------------------------------------------------
+Mon Apr 18 18:00:17 2005 Michael Jennings (mej)
+
+Applied a patch from Fredrik Svensson <[EMAIL PROTECTED]> for 256-color
+support (a la xterm). I also renamed and imported a couple of his
+test scripts into utils/, and in playing around with them, I found and
+fixed an X server resource leak. Use Etpalette to view the 256-color
+palette.
+----------------------------------------------------------------------
+Mon Apr 18 21:49:08 2005 Michael Jennings (mej)
+
+Re-indent code.
+----------------------------------------------------------------------
+Mon Apr 18 22:11:22 2005 Michael Jennings (mej)
+
+Patch from C. David Wilde <[EMAIL PROTECTED]> to correct the non-MMX
+color modifier routines.
+----------------------------------------------------------------------
+Wed Apr 20 19:07:38 2005 Michael Frysinger (vapier)
+
+Patch from Tres Melton <[EMAIL PROTECTED]> to fix window manager
+hints on 64bit systems. http://bugs.gentoo.org/show_bug.cgi?id=76324
+----------------------------------------------------------------------
+Mon Apr 25 15:34:49 2005 Michael Jennings (mej)
+
+Added --enable-escreen-fx flag to ./configure to enable/disable the
+Escreen startup effects (bosconian, matrix, etc.).
+
+Fixed some warnings.
+----------------------------------------------------------------------
+Tue Apr 26 11:45:39 2005 Michael Jennings (mej)
+
+Fixed incorrect WORDS_BIGENDIAN logic caught by Tres Melton
+<[EMAIL PROTECTED]>.
+----------------------------------------------------------------------
+Tue Apr 26 12:10:16 2005 Michael Jennings (mej)
+
+Reverted patch from C. David Wilde <[EMAIL PROTECTED]> which broke
+big-endian machines and really didn't fix anything at all. Thanks to
+Tres Melton <[EMAIL PROTECTED]> for catching this.
+----------------------------------------------------------------------
+Tue Apr 26 13:40:54 2005 Michael Jennings (mej)
+
+Patch from Tres Melton <[EMAIL PROTECTED]> to optimize 24-bit and
+32-bit non-MMX shading routines.
+----------------------------------------------------------------------
+Tue Apr 26 14:38:20 2005 Michael Jennings (mej)
+
+Patch from Bryan Kadzban <[EMAIL PROTECTED]> to fix unsetting
+of bold/blink attribute.
+----------------------------------------------------------------------
+Wed Apr 27 14:46:41 2005 Michael Jennings (mej)
+
+Disable MMX on x86_64 for now.
+----------------------------------------------------------------------
+Sat May 7 02:30:53 2005 Michael Jennings (mej)
+
+Patch from Tres Melton <[EMAIL PROTECTED]> to correct overflow in
+non-MMX 16bpp shading code.
+----------------------------------------------------------------------
+Sun May 8 21:13:45 2005 Michael Jennings (mej)
+
+Patch from Tres Melton <[EMAIL PROTECTED]> to fix 15bpp shading
+routines.
+----------------------------------------------------------------------
+Tue May 10 14:57:45 2005 Michael Jennings (mej)
+
+Previous patch was incomplete; this fixes it.
+----------------------------------------------------------------------
+Sat May 14 18:56:55 2005 Michael Frysinger (vapier)
+
+Twin 0.4.6 and 0.5.1 install the header 'Tw/Tw1.h', not 'Tw/Tw_1.h'.
+----------------------------------------------------------------------
+Thu Jun 2 13:36:23 2005 Michael Jennings (mej)
+
+A couple small fixes from Yasufumi Haga <[EMAIL PROTECTED]> to
+the man page and the handling of multi-byte fonts.
+----------------------------------------------------------------------
+Mon Jun 13 19:28:19 2005 Michael Jennings (mej)
+
+Cleanups and optimizations from Tres Melton <[EMAIL PROTECTED]>.
+----------------------------------------------------------------------
+Tue Jun 14 15:36:09 2005 Michael Jennings (mej)
+
+Added SSE2 support patch thanks to Tres Melton <[EMAIL PROTECTED]>
+and John Ellson <[EMAIL PROTECTED]>.
+----------------------------------------------------------------------
+Sun Jun 26 21:05:03 2005 Michael Jennings (mej)
+
+Attempt to fix autogen.sh for Gentoo and Solaris.
+
+Detect and avoid E 0.17 faking E 0.16.x's IPC mechanisms.
+----------------------------------------------------------------------
+Tue Aug 16 10:48:12 2005 Michael Jennings (mej)
+
+Applied a fix from [EMAIL PROTECTED] for a typo in keysym
+handling.
+
+Fixed percent signs in menu files thanks to Yasufumi Haga
+<[EMAIL PROTECTED]>.
+
+Fixed E IPC version check to work with old and new schemes.
+----------------------------------------------------------------------
+Thu Sep 1 02:12:29 2005 Michael Jennings (mej)
+
+Fix abort stuff.
+----------------------------------------------------------------------
+Thu Sep 1 02:16:17 2005 Michael Jennings (mej)
+
+Fix but disable vt100 answerbacks.
+----------------------------------------------------------------------
+Thu Sep 15 21:55:34 2005 Michael Jennings (mej)
+
+Support NetWM startup ID's.
+----------------------------------------------------------------------
+Wed Oct 5 14:41:00 2005 Michael Jennings (mej)
+
+Fixed an incredibly-difficult-to-track-down missing "break" statement
+which caused the "New..." and Ctrl-T functionality to fail to prompt
+for a tab name.
+----------------------------------------------------------------------
+Mon Dec 5 13:33:58 2005 Michael Jennings (mej)
+
+Merge and re-indent code.
+----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/Eterm.spec,v
retrieving revision 1.3.2.7
retrieving revision 1.3.2.8
diff -u -3 -r1.3.2.7 -r1.3.2.8
--- Eterm.spec 15 Mar 2005 22:32:14 -0000 1.3.2.7
+++ Eterm.spec 5 Dec 2005 18:33:34 -0000 1.3.2.8
@@ -13,7 +13,7 @@
Group: User Interface/X
Requires: imlib2, imlib2-loader_jpeg, imlib2-loader_png
#BuildSuggests: xorg-x11-devel
-BuildRequires: libast imlib2-devel XFree86-devel freetype-devel
+BuildRequires: libast imlib2-devel XFree86-devel
Source0: ftp://ftp.eterm.org/pub/Eterm/%{name}-%{version}.tar.%{compression}
Source1: ftp://ftp.eterm.org/pub/Eterm/%{name}-bg-%{version}.tar.%{compression}
URL: http://www.eterm.org/
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/autogen.sh,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -3 -r1.5.2.4 -r1.5.2.5
--- autogen.sh 15 Mar 2005 22:32:14 -0000 1.5.2.4
+++ autogen.sh 5 Dec 2005 18:33:34 -0000 1.5.2.5
@@ -1,6 +1,6 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
-# $Id: autogen.sh,v 1.5.2.4 2005/03/15 22:32:14 mej Exp $
+# $Id: autogen.sh,v 1.5.2.5 2005/12/05 18:33:34 mej Exp $
broken() {
echo
@@ -9,6 +9,12 @@
echo "ERROR: $1 not found."
exit -1
}
+abort() {
+ echo
+ echo "Running '$1' failed :("
+ echo "Try updating the package on your system and try again."
+ exit -2
+}
DIE=0
@@ -49,19 +55,21 @@
export LIBTOOLIZE ACLOCAL AUTOCONF AUTOHEADER AUTOMAKE
# Check for existing libast.m4 we can use. Use the local one if not.
-if test ! -f "`$ACLOCAL --print-ac-dir`/libast.m4"; then
- ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
-fi
+#if test ! -f "`$ACLOCAL --print-ac-dir`/libast.m4"; then
+# ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
+#fi
# Run the stuff.
-(set -x && $LIBTOOLIZE -c -f)
-(set -x && $ACLOCAL $ACLOCAL_FLAGS)
-(set -x && $AUTOCONF)
-(set -x && $AUTOHEADER)
-(set -x && $AUTOMAKE -a -c)
+(set -x && $LIBTOOLIZE -c -f) || abort libtool
+(set -x && $ACLOCAL -I . $ACLOCAL_FLAGS) || abort aclocal
+(set -x && $AUTOCONF) || abort autoconf
+(set -x && $AUTOHEADER) || abort autoheader
+(set -x && $AUTOMAKE -a -c) || abort automake
# Run configure.
-./configure "$@"
+if test x"$NOCONFIGURE" = x; then
+(set -x && ./configure "$@")
+fi
if [ -f cvs.motd ]; then
echo "ATTENTION CVS Users!"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/configure.in,v
retrieving revision 1.62.2.17
retrieving revision 1.62.2.18
diff -u -3 -r1.62.2.17 -r1.62.2.18
--- configure.in 15 Mar 2005 22:32:14 -0000 1.62.2.17
+++ configure.in 5 Dec 2005 18:33:34 -0000 1.62.2.18
@@ -1,4 +1,4 @@
-dnl# $Id: configure.in,v 1.62.2.17 2005/03/15 22:32:14 mej Exp $
+dnl# $Id: configure.in,v 1.62.2.18 2005/12/05 18:33:34 mej Exp $
PATH=$PATH:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin:/usr/contrib/bin:/usr/ucb/bin
export PATH
@@ -74,6 +74,9 @@
AC_DEFINE_UNQUOTED(UTMP_IDENT, "`grep '$''Id:' $srcdir/src/utmp.c | sed
's/^.*\$''Id: //;s/ \$.*$//;s/.v / /;s/ Exp//'`", [utmp.c RCS ID])
AC_DEFINE_UNQUOTED(WINDOWS_IDENT, "`grep '$''Id:' $srcdir/src/windows.c | sed
's/^.*\$''Id: //;s/ \$.*$//;s/.v / /;s/ Exp//'`", [windows.c RCS ID])
+dnl# Check for build/host/target system types
+AC_CANONICAL_HOST
+
dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
if test ! -z "${CFLAGS}" -o ! -z "${CCOPTS}"; then
CFLAGS_GIVEN=1
@@ -149,9 +152,6 @@
AC_SUBST(CCASFLAGS)
AC_SUBST(CCAS)
-dnl# Check for host system type
-AC_CANONICAL_HOST
-
dnl# Check the sanity of what we've done so far
AM_SANITY_CHECK
@@ -205,7 +205,7 @@
sys/sockio.h sys/byteorder.h malloc.h \
utmpx.h unistd.h bsd/signal.h regex.h \
regexp.h stdarg.h X11/Xmu/Atoms.h \
-X11/Sunkeysym.h)
+X11/Sunkeysym.h X11/Xlocale.h)
AC_HEADER_TIME
dnl# Missing typedefs and replacements
@@ -220,7 +220,13 @@
seteuid memmove putenv strsep setresuid setresgid \
memmem usleep snprintf strcasestr strcasechr \
strcasepbrk strrev nl_langinfo)
+
+# NOTE: The following line is NOT NOT NOT NOT NOT a typo!
+# If you are having problems with it, libast.m4 is not installed
+# or aclocal couldn't find it. Hence the problem is on YOUR end.
dps_snprintf_oflow()
+
+dnl# Check for math lib.
AC_CHECK_LIB(m, pow)
dnl# Portability checks for various functions
@@ -425,7 +431,19 @@
)
if test ! -z "$FOUND_SCREEN" || test ! -z "$FOUND_LIBTWIN"; then
- AC_DEFINE(ESCREEN, , [Define for Escreen support.])
+ AC_DEFINE(ESCREEN, , [Define for Escreen support.])
+ AC_MSG_CHECKING(for Escreen startup effects)
+ AC_ARG_ENABLE(escreen-fx, [ --enable-escreen-fx enable Escreen
startup effects], [
+ if test "$enableval" = "yes"; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(ESCREEN_FX, , [Define to enable Escreen startup
effects.])
+ else
+ AC_MSG_RESULT(no)
+ fi
+ ], [
+ AC_MSG_RESULT(no)
+ ]
+ )
fi
AC_MSG_CHECKING(if profiling macros should be included)
@@ -488,24 +506,51 @@
AC_DEFINE(PIXMAP_OFFSET, , [Define for pseudo-transparency
support.])
])
+dnl#
+dnl# MMX support
+dnl#
AC_MSG_CHECKING(for MMX support)
HAVE_MMX=""
AC_ARG_ENABLE(mmx, [ --enable-mmx enable MMX assembly routines], [
- test "x$enableval" = "xyes" && HAVE_MMX="yes"
+ test "x$enableval" = "xyes" && HAVE_MMX="yes"
], [
- if test x$build_os = xlinux-gnu; then
- grep mmx /proc/cpuinfo >/dev/null 2>&1 && HAVE_MMX="yes"
- fi
+ case $host_cpu in
+ i*86)
+ grep mmx /proc/cpuinfo >/dev/null 2>&1 &&
HAVE_MMX="yes"
+ ;;
+ esac
])
if test "x$HAVE_MMX" = "xyes"; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_MMX, , [Define for MMX support.])
+ AC_MSG_RESULT([yes (32-bit)])
+ AC_DEFINE(HAVE_MMX, , [Define for 32-bit MMX support.])
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([no (no MMX detected)])
fi
AM_CONDITIONAL(HAVE_MMX, test "x$HAVE_MMX" = "xyes")
dnl#
+dnl# SSE2 support
+dnl#
+AC_MSG_CHECKING(for SSE2 support)
+HAVE_SSE2=""
+AC_ARG_ENABLE(sse2, [ --enable-sse2 enable SSE2 assembly
routines], [
+ test "x$enableval" = "xyes" && HAVE_SSE2="yes"
+ ], [
+ case $host_cpu in
+ x86_64)
+ grep sse2 /proc/cpuinfo >/dev/null 2>&1 &&
HAVE_SSE2="yes"
+ ;;
+ esac
+ ])
+if test "x$HAVE_SSE2" = "xyes"; then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE(HAVE_SSE2, , [Define for 64-bit SSE2 support.])
+else
+ AC_MSG_RESULT([no (no SSE2 detected)])
+fi
+AM_CONDITIONAL(HAVE_SSE2, test "x$HAVE_SSE2" = "xyes")
+
+dnl#
dnl# LibAST
dnl#
LIBAST_MIN=5
@@ -817,9 +862,6 @@
XIM="TRUE"
])
-# check if we need X_LOCALE definition
-AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE, , [X locale.]),
AC_DEFINE(NO_XLOCALE, , [No X locale.]))
-
# For multibyte selection handling
#if test "$MULTICHAR_ENCODING" != "none"; then
AC_CHECK_LIB(Xmu, XmuInternAtom)
@@ -930,7 +972,7 @@
dnl# Enable/disable name reporting escape sequences
AC_MSG_CHECKING(if we should enable name reporting escape sequences)
-AC_ARG_ENABLE(name-eporting-escapes, [ --enable-name-reporting-escapes
Specify this to enable title/icon name reporting], [
+AC_ARG_ENABLE(name-reporting-escapes, [ --enable-name-reporting-escapes
Specify this to enable title/icon name reporting], [
if test "$enableval" = "yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE(ENABLE_NAME_REPORTING_ESCAPES, 1, [Defined to
enable title/icon name reporting escape sequences.])
@@ -1030,9 +1072,9 @@
Source code location: $srcdir
Host System Type: $host
Preprocessor: $CPP $CPPFLAGS
- Compiler: $CC $CFLAGS
+ Compiler: $CC $CFLAGS
Linker: $CC $LDFLAGS $LIBS
- Install path: $prefix
+ Install path: $prefix
See src/feature.h for further configuration information.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/reformat-code,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -3 -r1.2.2.2 -r1.2.2.3
--- reformat-code 19 Nov 2002 04:41:53 -0000 1.2.2.2
+++ reformat-code 5 Dec 2005 18:33:34 -0000 1.2.2.3
@@ -2,14 +2,14 @@
TYPENAMES=""
-for i in button_t buttonbar_t menu_t menuitem_t ; do
+for i in eterm_action_t button_t buttonbar_t menu_t menuitem_t ; do
TYPENAMES="$TYPENAMES -T $i"
done
for i in *.c src/*.c utils/*.c ; do
if test -f $i; then
echo Reformatting $i
- indent -bad -bap -bbo -br -brs -cdw -ce -ci4 -cli2 -cs -di1 -i4 -l180 \
+ indent -bad -bap -bbo -br -brs -cdw -ce -ci4 -cli4 -cs -di1 -i4 -l132 \
-lp -lps -nbc -nbfda -npcs -nprs -nsob -nss -nut -psl -saf -sai
-saw $TYPENAMES $i
fi
done
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
