From: root Date: Mon, 16 Jan 2006 09:25:28 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=2e4a25af4e3a3df73bd5f442acb20786ef8cd72a;p=dana%2Furxvt.git *** empty log message *** --- diff --git a/Changes b/Changes index 8572da95..8c27ab83 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,6 @@ rxvt-unicode changelog <= google-friendly title +TODO: nuke menubar.C and strings.C TODO: move pty/tty handling into a fork'ed server and drop all privs TODO: harmonize --disable-options into position-dependent options. TODO: after requesting the selection and getting a timeout, no further requests will be sent. @@ -7,6 +8,7 @@ TODO: "slow" rendering mode for bidi and scripts TODO: read property sequence is broken with respect to utf-8 etc. TODO: http://www120.pair.com/mccarthy/nextstep/intro.htmld/Workspace.html is the correct nextstep look. TODO: clarify and get rid of SMOOTH_REFRESH etc. +WISH: perl extension for background image loading and moving the origin. WISH: OnTheSpot editing, or maybe switch to miiiiiiif. or maybe use perl and an overlay... WISH: just for fun, do shade and tint with XRender. WISH: support tex fonts diff --git a/MANIFEST b/MANIFEST index 025d7332..c63be66e 100644 --- a/MANIFEST +++ b/MANIFEST @@ -117,7 +117,6 @@ src/scrollbar-rxvt.C src/scrollbar-xterm.C src/scrollbar-plain.C src/scrollbar.C -src/strings.C src/version.h src/xdefaults.C src/xpm.C diff --git a/autoconf/config.h.in b/autoconf/config.h.in index e8db91b7..8fb86b86 100644 --- a/autoconf/config.h.in +++ b/autoconf/config.h.in @@ -466,6 +466,3 @@ /* Define if you can embed a perl interpreter */ #undef ENABLE_PERL -/* Define if you don't need to use our replacement string functions */ -#undef NO_STRINGS - diff --git a/autoconf/configure.in b/autoconf/configure.in index 5611a7bb..f58d25eb 100644 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -99,7 +99,6 @@ dnl AC_PROG_LIBTOOL()dnl# libtool MALLOC_TYPE=S -support_addstrings=no support_frills=yes support_inheritpixmap=yes support_tinting=yes @@ -390,12 +389,6 @@ AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name]) RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` AC_SUBST(RXVTNAME) -AC_ARG_ENABLE(strings, - [ --enable-strings enable some replacement system functions], - [if test x$enableval = xyes -o x$enableval = xno; then - support_addstrings=$enableval - fi]) - AC_ARG_ENABLE(swapscreen, [ --disable-swapscreen disable swap screen support], [if test x$enableval = xno; then @@ -1448,10 +1441,6 @@ AC_SUBST(LIBS) AC_SUBST(X_LIBS) AC_SUBST(X_EXTRA_LIBS) -if test x$support_addstrings = xno; then - AC_DEFINE(NO_STRINGS, 1, Define if you don't need to use our replacement string functions) -fi - dnl# common parts of the Makefile MCOMMON=./autoconf/Make.common AC_SUBST_FILE(MCOMMON) diff --git a/configure b/configure index 15757b49..32c59306 100755 --- a/configure +++ b/configure @@ -893,7 +893,6 @@ Optional Features: --disable-resources disable all resource checking --enable-8bitctrls enable 8 bit control sequences (not recommended) --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt) - --enable-strings enable some replacement system functions --disable-swapscreen disable swap screen support --enable-iso14755 enable support for extended ISO 14755 modes --enable-frills enable support for rarely used features @@ -4319,7 +4318,6 @@ rm -f conftest.err conftest.$ac_objext \ MALLOC_TYPE=S -support_addstrings=no support_frills=yes support_inheritpixmap=yes support_tinting=yes @@ -4709,14 +4707,6 @@ _ACEOF RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` -# Check whether --enable-strings or --disable-strings was given. -if test "${enable_strings+set}" = set; then - enableval="$enable_strings" - if test x$enableval = xyes -o x$enableval = xno; then - support_addstrings=$enableval - fi -fi; - # Check whether --enable-swapscreen or --disable-swapscreen was given. if test "${enable_swapscreen+set}" = set; then enableval="$enable_swapscreen" @@ -12949,14 +12939,6 @@ fi -if test x$support_addstrings = xno; then - -cat >>confdefs.h <<\_ACEOF -#define NO_STRINGS 1 -_ACEOF - -fi - MCOMMON=./autoconf/Make.common diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod index 0c4b8fec..ce7b1ef0 100644 --- a/doc/rxvt.7.pod +++ b/doc/rxvt.7.pod @@ -2553,14 +2553,6 @@ do it. Removes any support for resource checking. -=item --enable-strings (default: off) - -Add support for our possibly faster memset() function and other -various routines, overriding your system's versions which may -have been hand-crafted in assembly or may require extra libraries -to link in. (this breaks ANSI-C rules and has problems on many -GNU/Linux systems). - =item --disable-swapscreen Remove support for secondary/swap screen. diff --git a/src/strings.C b/src/strings.C deleted file mode 100644 index 648b750d..00000000 --- a/src/strings.C +++ /dev/null @@ -1,303 +0,0 @@ -/*--------------------------------*-C-*---------------------------------* - * File: strings.C - *----------------------------------------------------------------------* - * - * All portions of code are copyright by their respective author/s. - * Copyright (c) 1997-2001 Geoff Wing - * Copyright (c) 2004-2006 Marc Lehmann - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - *----------------------------------------------------------------------*/ - -#include "../config.h" /* NECESSARY */ -#include "rxvt.h" /* NECESSARY */ - -#ifndef NO_STRINGS -/*----------------------------------------------------------------------*/ -/* - * a replacement for strcasecmp () to avoid linking an entire library. - * Mark Olesen added this in 2.15 but for which OS & library? - Geoff Wing - */ -int -strcasecmp (const char *s1, const char *s2) -{ - for ( ; tolower (*s1) == tolower (*s2); s1++, s2++) - if (!*s1) - return 0; - return (int) (tolower (*s1) - tolower (*s2)); -} - -int -strncasecmp (const char *s1, const char *s2, size_t n) -{ - for ( ; n-- && (tolower (*s1) == tolower (*s2)); s1++, s2++) - if (!*s1) - return 0; - if (n == 0) - return 0; - return (int) (tolower (*s1) - tolower (*s2)); -} - -char * -strcpy (char *d, const char *s) -{ - char *r = d; - - for ( ; (*r++ = *s++) != '\0'; ) ; - return d; -} - -char * -strncpy (char *d, const char *s, size_t len) -{ - char *r = d; - - if (len) - for ( ; len; len--) - if ((*r++ = *s++) == '\0') - { - for ( ; --len; ) - *r++ = '\0'; - break; - } - return d; -} - -int -strcmp (const char *s1, const char *s2) -{ - for ( ; (*s1 == *s2++); ) - if (*s1++ == '\0') - return 0; - return (int) ((unsigned char) *s1 - (unsigned char) *--s2); -} - -int -strncmp (const char *s1, const char *s2, size_t len) -{ - if (len) - { - for ( ; len-- && (*s1++ == *s2++); ) ; - if (++len) - return (int) ((unsigned char) *--s1 - (unsigned char) *--s2); - } - return 0; -} - -char * -strcat (char *s1, const char *s2) -{ - char *r = s1; - - if (*r != '\0') - for ( ; *++r != '\0'; ) ; - for ( ; (*r++ = *s2++) != '\0'; ) ; - - return s1; -} - -char * -strncat (char *s1, const char *s2, size_t len) -{ - char *r = s1; - - if (*r != '\0') - for ( ; *++r != '\0'; ) ; - for ( ; len-- && ((*r++ = *s2++) != '\0'); ) ; - *r = '\0'; - - return s1; -} - -size_t -strlen (const char *s) -{ - size_t len = 0; - - for ( ; *s++ != '\0'; len++) ; - return len; -} - -char * -strdup (const char *s) -{ - size_t len = strlen (s) + 1; - char *c; - - if ((c = malloc (len)) != NULL) - memcpy (c, s, len); - return c; -} - -char * -index (const char *s, int c) -{ - return strchr (s, c); -} - -char * -strchr (const char *s, int c) -{ - char *p = NULL; - - for (;;) - { - if (*s == (char)c) - { - p = (char *)s; - break; - } - if (*s++ == '\0') - break; - } - return p; - -} - -char * -rindex (const char *s, int c) -{ - return strrchr (s, c); -} - -char * -strrchr (const char *s, int c) -{ - char *p = NULL; - - for (;;) - { - if (*s == (char)c) - p = (char *)s; - if (*s++ == '\0') - break; - } - return p; -} - -void * -memcpy (void *s1, const void *s2, size_t len) -{ - /* has extra stack and time but less code space */ - return memmove (s1, s2, len); -} - -/*--------------------------------------------------------------------------* - * Possibly faster memmove () by Geoff Wing - *--------------------------------------------------------------------------*/ -void * -memmove (void *d, const void *s, size_t len) -{ - u_intp_t i; - unsigned char *dst = (unsigned char *)d; - const unsigned char *src = (const unsigned char *)s; - - if (len && d != s) - { - if ((u_intp_t)d < (u_intp_t)s) - { - /* forwards */ - i = (- (u_intp_t)dst) & (SIZEOF_INT_P - 1); - if (len >= 16 && i == ((- (u_intp_t)src) & (SIZEOF_INT_P - 1))) - { - /* speed up since src & dst are offset correctly */ - len -= (size_t)i; - for ( ; i--; ) - *dst++ = *src++; - for (i = (u_intp_t) (len / SIZEOF_INT_P); i--; ) - * ((u_intp_t *)dst)++ = * ((const u_intp_t *)src)++; - len &= (SIZEOF_INT_P - 1); - } - for ( ; len--; ) - *dst++ = *src++; - } - else - { - /* backwards */ - dst += len; - src += len; - i = ((u_intp_t)dst) & (SIZEOF_INT_P - 1); - if (len >= 16 && i == (((u_intp_t)src) & (SIZEOF_INT_P - 1))) - { - /* speed up since src & dst are offset correctly */ - len -= (size_t)i; - for ( ; i--; ) - *--dst = *--src; - for (i = (u_intp_t) (len / SIZEOF_INT_P); i--; ) - *-- ((u_intp_t *)dst) = *-- ((const u_intp_t *)src); - len &= (SIZEOF_INT_P - 1); - } - for ( ; len--; ) - *--dst = *--src; - } - } - return d; -} - -/*--------------------------------------------------------------------------* - * Possibly faster memset () by Geoff Wing - * presumptions: - * 1) intp_t write the best - * 2) SIZEOF_INT_P == power of 2 - *--------------------------------------------------------------------------*/ - -void -bzero (void *b, size_t len) -{ - memset (b, 0, len); -} - -void * -memset (void *p, int c1, size_t len) -{ - u_intp_t i, val; - unsigned char c = (unsigned char) c1; - unsigned char *lp = (unsigned char *) p; - - if (len) - { - if (len >= 16) - { /* < 16 probably not worth all the calculations */ - /* write out preceding characters so we align on an integer boundary */ - if ((i = ((- (u_intp_t)p) & (SIZEOF_INT_P - 1)))) - { - len -= (size_t)i; - for (; i--;) - *lp++ = c; - } - - /* do the fast writing */ - val = (c << 8) + c; -#if SIZEOF_INT_P >= 4 - val |= (val << 16); -#endif -#if SIZEOF_INT_P >= 8 - val |= (val << 32); -#endif -#if SIZEOF_INT_P == 16 - val |= (val << 64); -#endif - for (i = (u_intp_t) (len / SIZEOF_INT_P); i--;) - * ((u_intp_t *)lp)++ = val; - len &= (SIZEOF_INT_P - 1); - } - /* write trailing characters */ - for (; len--;) - *lp++ = c; - } - return p; -} -#endif -/*----------------------- end-of-file (C source) -----------------------*/ diff --git a/src/xdefaults.C b/src/xdefaults.C index 1f2d5f35..c265d577 100644 --- a/src/xdefaults.C +++ b/src/xdefaults.C @@ -370,9 +370,6 @@ static const char optionsstring[] = "options: " #if EIGHT_BIT_CONTROLS "8bitctrls," #endif -#if !defined(NO_STRINGS) - "strings," -#endif #if defined(ENABLE_FRILLS) "frills," #endif