From: pcg Date: Wed, 3 Mar 2004 04:07:45 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=79394a9b2920767f3c8ed9e9625f1ab2b85512a8;p=dana%2Furxvt.git *** empty log message *** --- diff --git a/.prebuild b/.prebuild index 1a947653..d810ace5 100644 --- a/.prebuild +++ b/.prebuild @@ -3,29 +3,13 @@ # # run autoheader # -newah=0 -autoheader --version | grep -q autoheader && newah=1 -if test $newah = 1; then - cmd="autoheader --include=autoconf autoconf/configure.in" -else - cmd="autoheader --localdir=autoconf autoconf/configure.in > autoconf/config.h.in" -fi -echo $cmd -eval $cmd +autoheader2.50 --include=autoconf autoconf/configure.in chmod 644 autoconf/config.h.in # # run autoconf # -newac=0 -autoconf --version | grep -q autoconf && newac=1 -if test $newac = 1; then - cmd="autoconf --include=autoconf autoconf/configure.in > configure" -else - cmd="autoconf --localdir=autoconf autoconf/configure.in > configure" -fi -echo $cmd -eval $cmd +autoconf2.50 --include=autoconf autoconf/configure.in > configure chmod 755 configure diff --git a/README.configure b/README.configure index 55cee871..8ee75a4d 100644 --- a/README.configure +++ b/README.configure @@ -15,12 +15,27 @@ cn common chinese encodings cn_ext rarely used but very big chinese encodigs all all of the above +--enable-xim + add support for XIM (X Input Method) protocol. This allows using + alternative input methods (e.g. kinput2) and will also correctly + set up the input for people using dead keys or compose keys. --enable-unicode3 enable support for unicode codepoints above 65535 (the basic multilingual page). This increases storage requirements per character from 2 to 4 bytes and is not too useful as font support in X11 and Xft is largely missing, although cut & paste will work correctly, as will displaying, if you have the right font(s). +--enable-fallback(=CLASS) + when reading resource settings, also read settings for class CLASS + (default: Rxvt). To disable resource fallback use --disable-fallback. +--with-res-name=NAME + use the given name (default: urxvt) as default application name + when reading resources. Specify --with-res-name=rxvt to replace + rxvt. +--with-res-class=CLASS + use the given class (default: URxvt) as default application class + when reading resources. Specify --with-res-class=Rxvt to replace + rxvt. --enable-utmp write user and tty to utmp file (used by programs like ``w'') at start of rxvt execution and delete information when rxvt exits. @@ -53,10 +68,6 @@ --enable-half-shadow make shadows on the scrollbar only half the normal width & height. only applicable to rxvt scrollbars ---enable-xim - add support for XIM (X Input Method) protocol. This allows using - alternative input methods (e.g. kinput2) and will also correctly - set up the input for people using dead keys or compose keys. --enable-ttygid change tty device setting to group "tty" - only use this if your system uses this type of security @@ -119,6 +130,9 @@ add support for a blinking cursor --enable-pointer-blank add support to have the pointer disappear when typing or inactive +--with-name=NAME + set the basename for the installed binaries (default: urxvt, resulting + in urxvt, urxvtd etc.). Specify --with-name=rxvt to replace rxvt. --with-term=NAME change the environmental variable for the terminal to NAME (default "rxvt") diff --git a/autoconf/config.h.in b/autoconf/config.h.in index 1b8b5479..cde122be 100644 --- a/autoconf/config.h.in +++ b/autoconf/config.h.in @@ -1,420 +1,463 @@ -/* autoconf/config.h.in. Generated automatically from autoconf/configure.in by autoheader 2.13. */ +/* autoconf/config.h.in. Generated from autoconf/configure.in by autoheader. */ -/* Define if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -#undef _ALL_SOURCE -#endif - -/* Define to empty if the keyword does not work. */ -#undef const +/* Define if you want blinking cursor support */ +#undef CURSOR_BLINK -/* Define to `int' if doesn't define. */ -#undef gid_t +/* Define if you want chinese codesets */ +#undef ENCODING_CN -/* Define if you have that is POSIX.1 compatible. */ -#undef HAVE_SYS_WAIT_H +/* Define if you want extended chinese codesets */ +#undef ENCODING_CN_EXT -/* Define as __inline if that's what the C compiler calls it. */ -#undef inline +/* Define if you want european extended codesets */ +#undef ENCODING_EU -/* Define to `int' if doesn't define. */ -#undef mode_t +/* Define if you want japanese codesets */ +#undef ENCODING_JP -/* Define to `int' if doesn't define. */ -#undef pid_t +/* Define if you want extended japanese codesets */ +#undef ENCODING_JP_EXT -/* Define if you need to in order for stat and other things to work. */ -#undef _POSIX_SOURCE +/* Define if you want korean codesets */ +#undef ENCODING_KR -/* Define as the return type of signal handlers (int or void). */ -#undef RETSIGTYPE +/* Define if you want vietnamese codesets */ +#undef ENCODING_VN -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS +/* Define if you want the depth of scrollbars and menus to be less */ +#undef HALFSHADOW -/* Define if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME +/* Define to 1 if you have the header file. */ +#undef HAVE_ASSERT_H -/* Define to `int' if doesn't define. */ -#undef uid_t +/* Define to 1 if you have the `atexit' function. */ +#undef HAVE_ATEXIT -/* Define if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H -/* The number of bytes in a char. */ -#undef SIZEOF_CHAR +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H -/* The number of bytes in a int. */ -#undef SIZEOF_INT +/* Define if you have _GNU_SOURCE getpt() */ +#undef HAVE_GETPT -/* The number of bytes in a int *. */ -#undef SIZEOF_INT_P +/* Define to 1 if you have the `grantpt' function. */ +#undef HAVE_GRANTPT -/* The number of bytes in a long. */ -#undef SIZEOF_LONG +/* Define to 1 if you have the header file. */ +#undef HAVE_GRP_H -/* The number of bytes in a long long. */ -#undef SIZEOF_LONG_LONG +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H -/* The number of bytes in a short. */ -#undef SIZEOF_SHORT +/* Define to 1 if you have the `isastream' function. */ +#undef HAVE_ISASTREAM -/* Define if you have the _getpty function. */ -#undef HAVE__GETPTY +/* Define to 1 if you have the header file. */ +#undef HAVE_LASTLOG_H -/* Define if you have the atexit function. */ -#undef HAVE_ATEXIT +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBC_H -/* Define if you have the grantpt function. */ -#undef HAVE_GRANTPT +/* Define to 1 if you have the `Xft' library (-lXft). */ +#undef HAVE_LIBXFT -/* Define if you have the isastream function. */ -#undef HAVE_ISASTREAM +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H -/* Define if you have the nanosleep function. */ +/* Define to 1 if you have the `nanosleep' function. */ #undef HAVE_NANOSLEEP -/* Define if you have the on_exit function. */ +/* Define if nl_langinfo(CODESET) works */ +#undef HAVE_NL_LANGINFO + +/* Define to 1 if you have the `on_exit' function. */ #undef HAVE_ON_EXIT -/* Define if you have the openpty function. */ +/* Define to 1 if you have the `openpty' function. */ #undef HAVE_OPENPTY -/* Define if you have the revoke function. */ +/* Define to 1 if you have the `revoke' function. */ #undef HAVE_REVOKE -/* Define if you have the seteuid function. */ +/* Define to 1 if you have the `seteuid' function. */ #undef HAVE_SETEUID -/* Define if you have the setpgid function. */ +/* Define if plain old setlocale works */ +#undef HAVE_SETLOCALE + +/* Define to 1 if you have the `setpgid' function. */ #undef HAVE_SETPGID -/* Define if you have the setpgrp function. */ +/* Define to 1 if you have the `setpgrp' function. */ #undef HAVE_SETPGRP -/* Define if you have the setreuid function. */ +/* Define to 1 if you have the `setreuid' function. */ #undef HAVE_SETREUID -/* Define if you have the setsid function. */ +/* Define to 1 if you have the `setsid' function. */ #undef HAVE_SETSID -/* Define if you have the setutent function. */ +/* Define to 1 if you have the `setutent' function. */ #undef HAVE_SETUTENT -/* Define if you have the ttyslot function. */ -#undef HAVE_TTYSLOT - -/* Define if you have the unlockpt function. */ -#undef HAVE_UNLOCKPT - -/* Define if you have the unsetenv function. */ -#undef HAVE_UNSETENV - -/* Define if you have the updwtmp function. */ -#undef HAVE_UPDWTMP - -/* Define if you have the header file. */ -#undef HAVE_X11_XFT_XFT_H - -/* Define if you have the header file. */ -#undef HAVE_ASSERT_H - -/* Define if you have the header file. */ -#undef HAVE_DLFCN_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDARG_H -/* Define if you have the header file. */ -#undef HAVE_FCNTL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H -/* Define if you have the header file. */ -#undef HAVE_GRP_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H -/* Define if you have the header file. */ -#undef HAVE_LASTLOG_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H -/* Define if you have the header file. */ -#undef HAVE_LIBC_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H -/* Define if you have the header file. */ -#undef HAVE_STDARG_H +/* Define if utmp.h or lastlog.h has struct lastlog */ +#undef HAVE_STRUCT_LASTLOG -/* Define if you have the header file. */ -#undef HAVE_STDINT_H +/* Define if utmpx.h or lastlog.h has struct lastlogx */ +#undef HAVE_STRUCT_LASTLOGX -/* Define if you have the header file. */ -#undef HAVE_STDLIB_H +/* Define if utmp.h has struct utmp */ +#undef HAVE_STRUCT_UTMP -/* Define if you have the header file. */ -#undef HAVE_STRING_H +/* Define if utmpx.h has struct utmpx */ +#undef HAVE_STRUCT_UTMPX -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_BYTEORDER_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_IOCTL_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_SELECT_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKIO_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_STRREDIR_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIME_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#undef HAVE_SYS_WAIT_H + +/* Define to 1 if you have the header file. */ #undef HAVE_TERMIOS_H -/* Define if you have the header file. */ +/* Define to 1 if you have the `ttyslot' function. */ +#undef HAVE_TTYSLOT + +/* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define if you have the header file. */ -#undef HAVE_UTMP_H +/* Define to 1 if you have the `unlockpt' function. */ +#undef HAVE_UNLOCKPT -/* Define if you have the header file. */ -#undef HAVE_UTMPX_H +/* Define to 1 if you have the `unsetenv' function. */ +#undef HAVE_UNSETENV -/* Define if you have the Xft library (-lXft). */ -#undef HAVE_LIBXFT +/* Define to 1 if you have the `updwtmp' function. */ +#undef HAVE_UPDWTMP -/* Build shared library version - specify via configure only */ -#undef LIBRXVT +/* Define to 1 if you have the header file. */ +#undef HAVE_UTMPX_H -/* Define if you want the depth of scrollbars and menus to be less */ -#undef HALFSHADOW +/* Define if struct utmpx contains ut_host */ +#undef HAVE_UTMPX_HOST -/* Define to change gid of ttys to group tty */ -#undef TTY_GID_SUPPORT +/* Define to 1 if you have the header file. */ +#undef HAVE_UTMP_H -/* Define if you don't want support for the backspace key */ -#undef NO_BACKSPACE_KEY +/* Define if struct utmp contains ut_host */ +#undef HAVE_UTMP_HOST -/* Define if you don't want support for the (non-keypad) delete key */ -#undef NO_DELETE_KEY +/* Define if struct utmp contains ut_pid */ +#undef HAVE_UTMP_PID -/* Define if you don't want any resources read */ -#undef NO_RESOURCES +/* Define to 1 if you have the header file. */ +#undef HAVE_X11_XFT_XFT_H -/* Define if you want to use XGetDefault instead of our internal version */ -#undef USE_XGETDEFAULT +/* Define if Xlocale support works */ +#undef HAVE_XLOCALE -/* Disable the secondary screen. Many programs use the secondary screen as their workplace */ -#undef NO_SECONDARY_SCREEN +/* Define if you have XPointer typedef */ +#undef HAVE_XPOINTER -/* Define to remove xterm style mouse selection */ -#undef NO_NEW_SELECTION +/* Define if setlocale (defined to Xsetlocale) works */ +#undef HAVE_XSETLOCALE -/* Define to use smart resize behavior */ -#undef SMART_RESIZE +/* Define to 1 if you have the `_getpty' function. */ +#undef HAVE__GETPTY -/* Define if you want 256 colour support */ -#undef TTY_256COLOR +/* Define if lastlog is provided via a directory */ +#undef LASTLOG_IS_DIR -/* Set TERM to the value given by configure */ -#undef TERMENV +/* Define if you want to have lastlog support when utmp/utmpx is enabled */ +#undef LASTLOG_SUPPORT -/* Set TERMINFO value to the value given by configure */ -#undef RXVT_TERMINFO +/* Build shared library version - specify via configure only */ +#undef LIBRXVT -/* Define if you need function prototypes */ -#undef PROTOTYPES +/* Define if you want Menubar support */ +#undef MENUBAR -/* Define if you include on a normal include path (be careful) */ -#undef XPM_INC_X11 +/* Define to have CTRL cause wheel events to accelerate scrolling. Release + CTRL to halt scrolling */ +#undef MOUSE_SLIP_WHEELING -/* Define if you have XPointer typedef */ -#undef HAVE_XPOINTER +/* Define to use wheel events (button4 and button5) to scroll */ +#undef MOUSE_WHEEL -/* Define if utmp.h has struct utmp */ -#undef HAVE_STRUCT_UTMP +/* Support NeXT style scrollbars */ +#undef NEXT_SCROLLBAR -/* Define if struct utmp contains ut_host */ -#undef HAVE_UTMP_HOST +/* Define if you don't want support for the backspace key */ +#undef NO_BACKSPACE_KEY -/* Define if struct utmp contains ut_pid */ -#undef HAVE_UTMP_PID +/* Define if you don't want support for the (non-keypad) delete key */ +#undef NO_DELETE_KEY -/* Define if utmpx.h has struct utmpx */ -#undef HAVE_STRUCT_UTMPX +/* Define if you don't want handling for rarely used features */ +#undef NO_FRILLS -/* Define if struct utmpx contains ut_host */ -#undef HAVE_UTMPX_HOST +/* Define if you don't want support linespace */ +#undef NO_LINESPACE -/* Define if utmp.h or lastlog.h has struct lastlog */ -#undef HAVE_STRUCT_LASTLOG +/* Define to remove xterm style mouse selection */ +#undef NO_NEW_SELECTION -/* Define if utmpx.h or lastlog.h has struct lastlogx */ -#undef HAVE_STRUCT_LASTLOGX +/* Define to remove old rxvt (ver 2.20 and before) style selection */ +#undef NO_OLD_SELECTION -/* Define location of utmp */ -#undef RXVT_UTMP_FILE +/* Define if you don't want any resources read */ +#undef NO_RESOURCES -/* Define location of utmpx */ -#undef RXVT_UTMPX_FILE +/* Define for continual scrolling when you keep the scrollbar button pressed + */ +#undef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING -/* Define location of wtmp */ -#undef RXVT_WTMP_FILE +/* Disable the secondary screen. Many programs use the secondary screen as + their workplace */ +#undef NO_SECONDARY_SCREEN -/* Define location of wtmpx */ -#undef RXVT_WTMPX_FILE +/* Define if you don't need to use our replacement string functions */ +#undef NO_STRINGS -/* Define location of lastlog */ -#undef RXVT_LASTLOG_FILE +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT -/* Define if lastlog is provided via a directory */ -#undef LASTLOG_IS_DIR +/* Define to the full name of this package. */ +#undef PACKAGE_NAME -/* Define location of lastlogx */ -#undef RXVT_LASTLOGX_FILE +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING -/* Define location of ttys/ttytab */ -#undef TTYTAB_FILENAME +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME -/* Define if Xlocale support works */ -#undef HAVE_XLOCALE +/* Define to the version of this package. */ +#undef PACKAGE_VERSION -/* Define if setlocale (defined to Xsetlocale) works */ -#undef HAVE_XSETLOCALE +/* Support plain style scrollbars */ +#undef PLAIN_SCROLLBAR -/* Define if plain old setlocale works */ -#undef HAVE_SETLOCALE +/* Define if you want hide the pointer while typing */ +#undef POINTER_BLANK -/* Define if nl_langinfo(CODESET) works */ -#undef HAVE_NL_LANGINFO +/* Define to use a 24 bit visual if the screen has 24 bit mode */ +#undef PREFER_24BIT -/* Define if you have _GNU_SOURCE getpt() */ -#undef HAVE_GETPT +/* Define if you need function prototypes */ +#undef PROTOTYPES -/* Define for this pty type */ -#undef PTYS_ARE_OPENPTY +/* Define for first char in devptyXX */ +#undef PTYCHAR1 + +/* Define for second char in devptyXX */ +#undef PTYCHAR2 /* Define for this pty type */ -#undef PTYS_ARE_NUMERIC +#undef PTYS_ARE_CLONE /* Define for this pty type */ -#undef PTYS_ARE_PTMX +#undef PTYS_ARE_GETPT /* Define for this pty type */ -#undef PTYS_ARE_PTC +#undef PTYS_ARE_GETPTY /* Define for this pty type */ -#undef PTYS_ARE__GETPTY +#undef PTYS_ARE_NUMERIC /* Define for this pty type */ -#undef PTYS_ARE_GETPTY +#undef PTYS_ARE_OPENPTY /* Define for this pty type */ -#undef PTYS_ARE_GETPT +#undef PTYS_ARE_PTC /* Define for this pty type */ -#undef PTYS_ARE_CLONE +#undef PTYS_ARE_PTMX /* Define for this pty type */ #undef PTYS_ARE_SEARCHED -/* Define for first char in devptyXX */ -#undef PTYCHAR1 +/* Define for this pty type */ +#undef PTYS_ARE__GETPTY -/* Define for second char in devptyXX */ -#undef PTYCHAR2 +/* Resource class */ +#undef RESCLASS -/* Define if you want your background to use the parent window background */ -#undef TRANSPARENT +/* Fallback resource class */ +#undef RESFALLBACK -/* Define for continual scrolling when you keep the scrollbar button pressed */ -#undef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING +/* Default resource name */ +#undef RESNAME -/* Define to allow scrolling when the selection moves to the top or bottom of the screen */ -#undef SELECTION_SCROLLING +/* Define as the return type of signal handlers (`int' or `void'). */ +#undef RETSIGTYPE -/* Define if you want Menubar support */ -#undef MENUBAR +/* Define location of lastlogx */ +#undef RXVT_LASTLOGX_FILE -/* Define if you don't want handling for rarely used features */ -#undef NO_FRILLS +/* Define location of lastlog */ +#undef RXVT_LASTLOG_FILE -/* Define if you don't want support linespace */ -#undef NO_LINESPACE +/* Support Rxvt original style scrollbars */ +#undef RXVT_SCROLLBAR -/* Define to use a 24 bit visual if the screen has 24 bit mode */ -#undef PREFER_24BIT +/* Set TERMINFO value to the value given by configure */ +#undef RXVT_TERMINFO -/* Define to use wheel events (button4 and button5) to scroll */ -#undef MOUSE_WHEEL +/* Define location of utmpx */ +#undef RXVT_UTMPX_FILE -/* Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling */ -#undef MOUSE_SLIP_WHEELING +/* Define location of utmp */ +#undef RXVT_UTMP_FILE -/* Define to remove old rxvt (ver 2.20 and before) style selection */ -#undef NO_OLD_SELECTION +/* Define location of wtmpx */ +#undef RXVT_WTMPX_FILE -/* Define if you want to have utmp/utmpx support */ -#undef UTMP_SUPPORT +/* Define location of wtmp */ +#undef RXVT_WTMP_FILE -/* Define if you want to have wtmp support when utmp/utmpx is enabled */ -#undef WTMP_SUPPORT +/* Define to allow scrolling when the selection moves to the top or bottom of + the screen */ +#undef SELECTION_SCROLLING -/* Define if you want to have lastlog support when utmp/utmpx is enabled */ -#undef LASTLOG_SUPPORT +/* The size of a `char', as computed by sizeof. */ +#undef SIZEOF_CHAR -/* Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input */ -#undef USE_XIM +/* The size of a `int', as computed by sizeof. */ +#undef SIZEOF_INT -/* Define if you want to have sexy-looking background pixmaps. Needs libXpm */ -#undef XPM_BACKGROUND +/* The size of a `int *', as computed by sizeof. */ +#undef SIZEOF_INT_P -/* Support Rxvt original style scrollbars */ -#undef RXVT_SCROLLBAR +/* The size of a `long', as computed by sizeof. */ +#undef SIZEOF_LONG -/* Support NeXT style scrollbars */ -#undef NEXT_SCROLLBAR +/* The size of a `long long', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG -/* Support Xterm style scrollbars */ -#undef XTERM_SCROLLBAR +/* The size of a `short', as computed by sizeof. */ +#undef SIZEOF_SHORT -/* Support plain style scrollbars */ -#undef PLAIN_SCROLLBAR +/* Define to use "smart" resize behavior */ +#undef SMART_RESIZE -/* Define if you want hide the pointer while typing */ -#undef POINTER_BLANK +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS -/* Define if you want blinking cursor support */ -#undef CURSOR_BLINK +/* Set TERM to the value given by configure */ +#undef TERMENV /* Define if you want blinking text support */ #undef TEXT_BLINK -/* Define if you want to represent unicode characters outside plane 0 */ -#undef UNICODE_3 +/* Define to 1 if you can safely include both and . */ +#undef TIME_WITH_SYS_TIME -/* Define if you want european extended codesets */ -#undef ENCODING_EU +/* Define if you want your background to use the parent window background */ +#undef TRANSPARENT -/* Define if you want vietnamese codesets */ -#undef ENCODING_VN +/* Define location of ttys/ttytab */ +#undef TTYTAB_FILENAME -/* Define if you want japanese codesets */ -#undef ENCODING_JP +/* Define if you want 256 colour support */ +#undef TTY_256COLOR -/* Define if you want extended japanese codesets */ -#undef ENCODING_JP_EXT +/* Define to change gid of ttys to group tty */ +#undef TTY_GID_SUPPORT -/* Define if you want korean codesets */ -#undef ENCODING_KR +/* Define if you want to represent unicode characters outside plane 0 */ +#undef UNICODE_3 -/* Define if you want chinese codesets */ -#undef ENCODING_CN +/* Define if you want to use XGetDefault instead of our internal version */ +#undef USE_XGETDEFAULT -/* Define if you want extended chinese codesets */ -#undef ENCODING_CN_EXT +/* Define if you want to have XIM (X Input Method) protocol support - required + for multibyte characters input */ +#undef USE_XIM -/* Define if you don't need to use our replacement string functions */ -#undef NO_STRINGS +/* Define if you want to have utmp/utmpx support */ +#undef UTMP_SUPPORT + +/* Define if you want to have wtmp support when utmp/utmpx is enabled */ +#undef WTMP_SUPPORT /* Define to enable xft support */ #undef XFT +/* Define if you want to have sexy-looking background pixmaps. Needs libXpm */ +#undef XPM_BACKGROUND + +/* Define if you include on a normal include path (be careful) */ +#undef XPM_INC_X11 + +/* Support Xterm style scrollbars */ +#undef XTERM_SCROLLBAR + +/* Define to 1 if the X Window System is missing or not being used. */ +#undef X_DISPLAY_MISSING + +/* Define to 1 if on AIX 3. + System headers sometimes define this. + We just want to avoid a redefinition error message. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `int' if doesn't define. */ +#undef gid_t + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif + +/* Define to `int' if does not define. */ +#undef mode_t + +/* Define to `int' if does not define. */ +#undef pid_t + +/* Define to `int' if doesn't define. */ +#undef uid_t diff --git a/autoconf/configure.in b/autoconf/configure.in index d89dd180..981130a2 100644 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -133,15 +133,11 @@ AC_ARG_ENABLE(unicode3, fi]) AC_ARG_ENABLE(xft, - [ --enable-xft enable xft support on systems that have it], + [ --enable-xft enable xft support on systems that have it], [if test x$enableval = xyes -o x$enableval = xno; then support_xft=yes fi]) -AC_ARG_WITH(codesets, - [ --with-codesets=NAME,... compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all)], - [codesets="$withval"]) - AC_ARG_ENABLE(utmp, [ --enable-utmp enable utmp (utmpx) support], [if test x$enableval = xyes -o x$enableval = xno; then @@ -208,6 +204,10 @@ AC_ARG_ENABLE(half-shadow, AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) fi]) +AC_ARG_WITH(codesets, + [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all)], + [codesets="$withval"]) + AC_ARG_ENABLE(xim, [ --enable-xim XIM (X Input Method) protocol support], [if test x$enableval = xyes -o x$enableval = xno; then @@ -244,6 +244,39 @@ AC_ARG_ENABLE(xgetdefault, AC_DEFINE(USE_XGETDEFAULT, 1, Define if you want to use XGetDefault instead of our internal version) fi]) +RESFALLBACK=Rxvt +AC_ARG_ENABLE(fallback, + [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], + [ + test x$enableval = xyes && enableval=Rxvt + test x$enableval = xno && enableval= + RESFALLBACK="$enableval" + ]) + +if test x$RESFALLBACK != x; then + AC_DEFINE_UNQUOTED(RESFALLBACK, "$RESFALLBACK", [Fallback resource class]) +fi + +RESNAME=urxvt +AC_ARG_WITH(res-name, + [ --with-res-name=NAME use this as default resource name (default: urxvt)], + [RESNAME="$withval"]) +AC_DEFINE_UNQUOTED(RESNAME,"$RESNAME", [Default resource name]) + +RESCLASS=URxvt +AC_ARG_WITH(res-class, + [ --with-res-class=CLASS use this as the resource class (default: URxvt)], + [RESCLASS="$withval"]) +AC_DEFINE_UNQUOTED(RESCLASS,"$RESCLASS", [Resource class]) + +RXVTNAME=urxvt +AC_ARG_WITH(name, + [ --with-name=NAME set the basename for the installed binaries (default: urxvt)], + [RXVTNAME="$withval"]) + +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 @@ -360,7 +393,7 @@ AC_ARG_ENABLE(pointer-blank, fi]) AC_ARG_WITH(term, - [ --with-term=NAME set the terminal to NAME (default \"rxvt\")], + [ --with-term=NAME set the terminal to NAME (default: rxvt)], [if test x$withval != x; then AC_DEFINE_UNQUOTED(TERMENV, "$withval",Set TERM to the value given by configure) term="$withval" fi]) @@ -1251,9 +1284,6 @@ AC_SUBST_FILE(MCOMMON) AC_ARG_PROGRAM -RXVTNAME=`echo rxvt|sed "$program_transform_name"` -AC_SUBST(RXVTNAME) - dnl# test for "sun" or "__sun__" before include sys_ioctl dnl# revert HAVE_BLAH_H into a "#include " diff --git a/configure b/configure index 0d8a8f8f..7140f663 100755 --- a/configure +++ b/configure @@ -467,7 +467,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION DATE LSMDATE LIBVERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK LINKER CXXCPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL INSTALL_LIBRXVT MV RM CP LN SED CMP TBL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XPM_CPPFLAGS XPM_CFLAGS XPM_LIBS rxvt_int16_typedef rxvt_uint16_typedef rxvt_int32_typedef rxvt_uint32_typedef rxvt_intp_define rxvt_u_intp_define DEBUG DINCLUDE DLIB RXVTNAME include_stdint_h include_stdarg_h include_stdlib_h include_unistd_h include_string_h include_fcntl_h include_util_h include_assert_h include_sys_ioctl_h include_sys_select_h include_sys_strredir_h include_sys_time_h include_time_h LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION DATE LSMDATE LIBVERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK LINKER CXXCPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL INSTALL_LIBRXVT RXVTNAME MV RM CP LN SED CMP TBL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XPM_CPPFLAGS XPM_CFLAGS XPM_LIBS rxvt_int16_typedef rxvt_uint16_typedef rxvt_int32_typedef rxvt_uint32_typedef rxvt_intp_define rxvt_u_intp_define DEBUG DINCLUDE DLIB include_stdint_h include_stdarg_h include_stdlib_h include_unistd_h include_string_h include_fcntl_h include_util_h include_assert_h include_sys_ioctl_h include_sys_select_h include_sys_strredir_h include_sys_time_h include_time_h LIBOBJS LTLIBOBJS' ac_subst_files='MCOMMON' # Initialize some variables set by options. @@ -1031,7 +1031,7 @@ Optional Features: NOTE: this option is order dependent NOTE: automatically enabled with --enable-shared --enable-unicode3 use 21 instead of 16 bits to represent unicode characters - --enable-xft enable xft support on systems that have it + --enable-xft enable xft support on systems that have it --enable-utmp enable utmp (utmpx) support --enable-wtmp enable wtmp (wtmpx) support (requires --enable-utmp) --enable-lastlog enable lastlog support (requires --enable-utmp) @@ -1049,6 +1049,7 @@ Optional Features: --disable-delete-key disable handling of the delete key --disable-resources disable all resource checking --enable-xgetdefault enable resources via X instead of our small version + --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-frills enable support for rarely used features @@ -1074,8 +1075,11 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-gnu-ld assume the C compiler uses GNU ld default=no --with-pic try to use only PIC/non-PIC objects default=use both - --with-codesets=NAME,... compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all) - --with-term=NAME set the terminal to NAME (default \"rxvt\") + --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all) + --with-res-name=NAME use this as default resource name (default: urxvt) + --with-res-class=NAME use this as the resource class (default: URxvt) + --with-name=NAME set the basename for the installed binaries (default: urxvt) + --with-term=NAME set the terminal to NAME (default: rxvt) --with-terminfo=PATH set the path to the terminfo tree to PATH --with-x use the X Window System --with-xpm-includes=DIR use XPM includes in DIR @@ -5032,7 +5036,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 5035 "configure"' > conftest.$ac_ext + echo '#line 5039 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5583,7 +5587,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -7199,7 +7203,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <>confdefs.h <<_ACEOF +#define RESFALLBACK "$RESFALLBACK" +_ACEOF + +fi + +RESNAME=urxvt + +# Check whether --with-res-name or --without-res-name was given. +if test "${with_res_name+set}" = set; then + withval="$with_res_name" + RESNAME="$withval" +fi; + +cat >>confdefs.h <<_ACEOF +#define RESNAME "$RESNAME" +_ACEOF + + +RESCLASS=URxvt + +# Check whether --with-res-class or --without-res-class was given. +if test "${with_res_class+set}" = set; then + withval="$with_res_class" + RESCLASS="$withval" +fi; + +cat >>confdefs.h <<_ACEOF +#define RESCLASS "$RESCLASS" +_ACEOF + + +RXVTNAME=urxvt + +# Check whether --with-name or --without-name was given. +if test "${with_name+set}" = set; then + withval="$with_name" + RXVTNAME="$withval" +fi; + +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" @@ -16427,9 +16487,6 @@ program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed -RXVTNAME=`echo rxvt|sed "$program_transform_name"` - - @@ -17396,6 +17453,7 @@ s,@STRIP@,$STRIP,;t t s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@INSTALL_LIBRXVT@,$INSTALL_LIBRXVT,;t t +s,@RXVTNAME@,$RXVTNAME,;t t s,@MV@,$MV,;t t s,@RM@,$RM,;t t s,@CP@,$CP,;t t @@ -17419,7 +17477,6 @@ s,@rxvt_u_intp_define@,$rxvt_u_intp_define,;t t s,@DEBUG@,$DEBUG,;t t s,@DINCLUDE@,$DINCLUDE,;t t s,@DLIB@,$DLIB,;t t -s,@RXVTNAME@,$RXVTNAME,;t t s,@include_stdint_h@,$include_stdint_h,;t t s,@include_stdarg_h@,$include_stdarg_h,;t t s,@include_stdlib_h@,$include_stdlib_h,;t t diff --git a/doc/Makefile.in b/doc/Makefile.in index a5699cb0..449a189c 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,5 +1,5 @@ # doc/Makefile.in -*- Makefile -*- -# $Id: Makefile.in,v 1.4 2004-02-24 21:51:41 pcg Exp $ +# $Id: Makefile.in,v 1.5 2004-03-03 04:07:52 pcg Exp $ @MCOMMON@ srcdir = @srcdir@ @@ -88,8 +88,8 @@ distclean: install: $(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(RXVTNAME).$(manext) - $(INSTALL_DATA) rxvtc.1 $(DESTDIR)$(mandir)/rxvtc.$(manext) - $(INSTALL_DATA) rxvtc.1 $(DESTDIR)$(mandir)/rxvtd.$(manext) + $(INSTALL_DATA) rxvtc.1 $(DESTDIR)$(mandir)/$(RXVTNAME)c.$(manext) + $(INSTALL_DATA) rxvtc.1 $(DESTDIR)$(mandir)/$(RXVTNAME)d.$(manext) uninstall: -(cd $(mandir); $(RMF) $(RXVTNAME).$(manext) ) diff --git a/reconf b/reconf index 97360ba6..41cc3a7e 100755 --- a/reconf +++ b/reconf @@ -6,7 +6,9 @@ ./configure --prefix=/opt/rxvt --enable-utmp \ --enable-wtmp --enable-lastlog --enable-xim --disable-strings \ --with-term=rxvt --enable-keepscrolling --enable-xft \ + --with-name=rxvt \ --enable-frills --enable-swapscreen --enable-transparency \ --with-codesets=eu,jp --enable-menubar \ --enable-cursor-blink --enable-pointer-blank --enable-text-blink \ - --enable-plain-scroll + --enable-plain-scroll \ + "$@" diff --git a/src/Makefile.in b/src/Makefile.in index 5bd78a3d..a03bc416 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.13 2004-03-01 01:06:46 pcg Exp $ +# $Id: Makefile.in,v 1.14 2004-03-03 04:07:52 pcg Exp $ @MCOMMON@ LINT = lint -DNARROWPROTO=1 $(XINC) -chapbxz @@ -50,11 +50,8 @@ INSTALL_LIBRXVT = @INSTALL_LIBRXVT@ RXVT_BASENAME=`$(ECHO) $(RXVTNAME)|$(SED) 's/$(EXEEXT)$$//'|$(SED) '$(transform)'` RXVT_BINNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)$(EXEEXT) -RXVT_VERNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)-$(VERSION)$(EXEEXT) RXVTC_BINNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)c$(EXEEXT) -RXVTC_VERNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)c-$(VERSION)$(EXEEXT) RXVTD_BINNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)d$(EXEEXT) -RXVTD_VERNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)d-$(VERSION)$(EXEEXT) RXVT_OLDNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)-old$(EXEEXT) EXTPROS = command.extpro defaultfont.extpro \ @@ -158,12 +155,9 @@ install: allbin alldoc $(RMF) $(RXVT_BINNAME) $(RMF) $(RXVTC_BINNAME) $(RMF) $(RXVTD_BINNAME) - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvt $(RXVT_VERNAME) - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvtc $(RXVTC_VERNAME) - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvtd $(RXVTD_VERNAME) - $(LN) $(RXVT_VERNAME) $(RXVT_BINNAME) - $(LN) $(RXVTC_VERNAME) $(RXVTC_BINNAME) - $(LN) $(RXVTD_VERNAME) $(RXVTD_BINNAME) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvt $(RXVT_BINNAME) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvtc $(RXVTC_BINNAME) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvtd $(RXVTD_BINNAME) uninstall: @$(ECHO) $(RMF) $(RXVT_VERNAME) diff --git a/src/command.C b/src/command.C index 55b232b0..c1348b77 100644 --- a/src/command.C +++ b/src/command.C @@ -293,35 +293,11 @@ rxvt_term::lookup_key (XKeyEvent &ev) } else STRCPY (kbuf, key_backspace); -# ifdef MULTICHAR_SET - if ((Options & Opt_mc_hack) && screen.cur.col > 0) - { - int col, row; - - newlen = STRLEN (kbuf); - col = screen.cur.col - 1; - row = screen.cur.row + TermWin.saveLines; - if (IS_MULTI2 (screen.rend[row][col])) - MEMMOVE (kbuf + newlen, kbuf, newlen + 1); - } -# endif break; #endif #ifndef NO_DELETE_KEY case XK_Delete: STRCPY (kbuf, key_delete); -# ifdef MULTICHAR_SET - if (Options & Opt_mc_hack) - { - int col, row; - - newlen = STRLEN (kbuf); - col = screen.cur.col; - row = screen.cur.row + TermWin.saveLines; - if (IS_MULTI1 (screen.rend[row][col])) - MEMMOVE (kbuf + newlen, kbuf, newlen + 1); - } -# endif break; #endif case XK_Tab: @@ -373,41 +349,6 @@ rxvt_term::lookup_key (XKeyEvent &ev) } else if (PrivateModes & PrivMode_aplCUR) kbuf[1] = 'O'; -#ifdef MULTICHAR_SET - //TODO: ?? - if (Options & Opt_mc_hack) - { - int col, row, m; - - col = screen.cur.col; - row = screen.cur.row + TermWin.saveLines; - m = 0; - if (keysym == XK_Right - && IS_MULTI1 (screen.rend[row][col])) - m = 1; - else if (keysym == XK_Left) - { - if (col > 0) - { - if (IS_MULTI2 (screen.rend[row][col - 1])) - m = 1; - } - else if (screen.cur.row > 0) - { - col = screen.tlen[--row]; - if (col == -1) - col = TermWin.ncol - 1; - else - col--; - if (col > 0 - && IS_MULTI2 (screen.rend[row][col])) - m = 1; - } - } - if (m) - MEMMOVE (kbuf + 3, kbuf, 3 + 1); - } -#endif break; #ifndef UNSHIFTED_SCROLLKEYS @@ -944,14 +885,20 @@ rxvt_term::next_char () { while (cmdbuf_ptr < cmdbuf_endp) { - if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh + // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh + if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr) + || !*cmdbuf_ptr) return *cmdbuf_ptr++; wchar_t wc; size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); if (len == (size_t)-2) - return NOCHAR; + { + // the mbstate stores incomplete sequences. didn't know this :/ + cmdbuf_ptr = cmdbuf_endp; + break; + } if (len == (size_t)-1) return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through @@ -2362,11 +2309,6 @@ rxvt_term::process_escape_seq () case '+': scr_charset_set (3, (unsigned int)cmd_getc ()); break; -#ifdef MULTICHAR_SET - case '$': - scr_charset_set (-2, (unsigned int)cmd_getc ()); - break; -#endif #ifndef NO_FRILLS case '6': scr_backindex (); @@ -2717,7 +2659,7 @@ rxvt_term::process_csi_seq () break; #endif case 8: /* unofficial extension */ - xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); + xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); break; } break; diff --git a/src/init.C b/src/init.C index a798e7f0..06bbd73a 100644 --- a/src/init.C +++ b/src/init.C @@ -1169,7 +1169,7 @@ rxvt_term::create_windows (int argc, const char *const *argv) xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); classHint.res_name = (char *)rs[Rs_name]; - classHint.res_class = (char *)APL_CLASS; + classHint.res_class = (char *)RESCLASS; wmHint.flags = (InputHint | StateHint | WindowGroupHint); wmHint.input = True; diff --git a/src/main.C b/src/main.C index 65a3774f..7ab5dd5d 100644 --- a/src/main.C +++ b/src/main.C @@ -387,7 +387,7 @@ rxvt_malloc (size_t size) if (p) return p; - fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); + fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); rxvt_clean_exit (); exit (EXIT_FAILURE); /* NOTREACHED */ @@ -403,7 +403,7 @@ rxvt_calloc (size_t number, size_t size) if (p) return p; - fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); + fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); rxvt_clean_exit (); exit (EXIT_FAILURE); /* NOTREACHED */ @@ -422,7 +422,7 @@ rxvt_realloc (void *ptr, size_t size) if (p) return p; - fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); + fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); rxvt_clean_exit (); exit (EXIT_FAILURE); /* NOTREACHED */ @@ -1038,7 +1038,7 @@ rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int igno XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, window_vt_y, TermWin_TotalWidth (), TermWin_TotalHeight ()); - scr_clear (); + scr_clear (height != old_height); #ifdef XPM_BACKGROUND resize_pixmap (); #endif diff --git a/src/menubar.C b/src/menubar.C index c67389db..8064ab46 100644 --- a/src/menubar.C +++ b/src/menubar.C @@ -1410,7 +1410,7 @@ rxvt_term::menubar_dump (FILE *fp) time (&t); fprintf (fp, - "# " APL_SUBCLASS " (%s) Pid: %u\n# Date: %s\n\n", + "# " RESCLASS " (%s) Pid: %u\n# Date: %s\n\n", rs[Rs_name], (unsigned int)getpid (), ctime (&t)); /* dump in reverse order */ @@ -1757,7 +1757,7 @@ rxvt_term::menubar_dispatch (char *str) /* enough space to hold the results */ char buffer[32]; - sprintf (buffer, "/tmp/" APL_SUBCLASS "-%u", + sprintf (buffer, "/tmp/" RESCLASS "-%u", (unsigned int)getpid ()); if ((fp = fopen (buffer, "wb")) != NULL) diff --git a/src/misc.C b/src/misc.C index fb413613..793cbab7 100644 --- a/src/misc.C +++ b/src/misc.C @@ -53,7 +53,7 @@ rxvt_print_error (const char *fmt,...) va_list arg_ptr; va_start (arg_ptr, fmt); - fprintf (stderr, APL_NAME ": "); + fprintf (stderr, RESNAME ": "); vfprintf (stderr, fmt, arg_ptr); fprintf (stderr, "\n"); va_end (arg_ptr); diff --git a/src/rxvt.h b/src/rxvt.h index 8733e00c..d31f1686 100644 --- a/src/rxvt.h +++ b/src/rxvt.h @@ -143,10 +143,6 @@ struct mouse_event { # error if you disable both selection styles, how can you select, silly? #endif -#define APL_CLASS "XTerm" /* class name */ -#define APL_SUBCLASS "Rxvt" /* also check resources under this name */ -#define APL_NAME "rxvt" /* normal name */ - /* COLORTERM, TERM environment variables */ #define COLORTERMENV "rxvt" #ifdef XPM_BACKGROUND @@ -1161,7 +1157,7 @@ struct rxvt_term : rxvt_vars { void scr_reset (); void scr_reset_realloc (); void scr_release (); - void scr_clear (); + void scr_clear (bool really = true); void scr_refresh (unsigned char refresh_type); bool scr_refresh_rend (rend_t mask, rend_t value); void scr_erase_screen (int mode); diff --git a/src/xdefaults.C b/src/xdefaults.C index bd57034f..7d6940ca 100644 --- a/src/xdefaults.C +++ b/src/xdefaults.C @@ -1,7 +1,7 @@ /*--------------------------------*-C-*---------------------------------* * File: xdefaults.c *----------------------------------------------------------------------* - * $Id: xdefaults.C,v 1.13 2004-02-24 21:41:16 pcg Exp $ + * $Id: xdefaults.C,v 1.15 2004-03-03 04:07:52 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1994 Robert Nation @@ -133,10 +133,6 @@ optList[] = { BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), #endif -#ifdef MULTICHAR_SET - BOOL (Rs_mc_hack, "multibyte_cursor", "mcc", Opt_mc_hack, - "Multibyte character cursor movement"), -#endif #ifndef NO_FRILLS BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), @@ -295,14 +291,17 @@ static const char optionsstring[] = "Options: " #endif #if defined(USE_XIM) "XIM," -#endif -#if defined(MULTICHAR_SET) - "multichar_languages," #endif "scrollbars=" #if !defined(HAVE_SCROLLBARS) "NONE" #else +# if defined(PLAIN_SCROLLBAR) + "plain" +# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) + "+" +# endif +# endif # if defined(RXVT_SCROLLBAR) "rxvt" # if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) @@ -354,7 +353,7 @@ rxvt_usage (int type) write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1); - write (STDERR_FILENO, APL_NAME, sizeof (APL_NAME) - 1); + write (STDERR_FILENO, RESNAME, sizeof (RESNAME) - 1); switch (type) { @@ -758,8 +757,8 @@ rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const c if (locale != NULL) { /* XXX: must limit length of string */ localepath = (char *)rxvt_malloc (256); - sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, - (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)), + sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, + (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)), locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ } @@ -824,15 +823,16 @@ rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const c # if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL) # endif - rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS); + rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS); + if (rdb1 != NULL) XrmMergeDatabases (rdb1, &database); /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL) { - sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname) - - sizeof (APL_SUBCLASS) - 2, xe); + sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname) + - sizeof (RESCLASS) - 2, xe); if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) XrmMergeDatabases (rdb1, &database); } @@ -856,12 +856,16 @@ rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const c p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); if (p == NULL || (p0 && STRCMP (p, p0) == 0)) { - p = XGetDefault (display, APL_SUBCLASS, kw); + p = XGetDefault (display, RESCLASS, kw); +#ifdef RESFALLBACK if (p == NULL || (p0 && STRCMP (p, p0) == 0)) - p = XGetDefault (display, APL_CLASS, kw); + p = XGetDefault (display, RESFALLBACK, kw); +#endif } + if (p == NULL && p0) p = p0; + if (p) { rs[optList[entry].doff] = p; @@ -890,19 +894,21 @@ rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const c name_prefix[0] = XrmStringToName (name); name_prefix[1] = XrmStringToName ("keysym"); name_prefix[2] = NULLQUARK; - class_prefix[0] = XrmStringToName (APL_SUBCLASS); + class_prefix[0] = XrmStringToName (RESCLASS); class_prefix[1] = XrmStringToName ("Keysym"); class_prefix[2] = NULLQUARK; /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, XrmEnumOneLevel, rxvt_define_key, NULL); - name_prefix[0] = XrmStringToName (APL_CLASS); +# ifdef RESFALLBACK + name_prefix[0] = XrmStringToName (RESFALLBACK); name_prefix[1] = XrmStringToName ("keysym"); - class_prefix[0] = XrmStringToName (APL_CLASS); + class_prefix[0] = XrmStringToName (RESFALLBACK); class_prefix[1] = XrmStringToName ("Keysym"); /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, XrmEnumOneLevel, rxvt_define_key, NULL); +# endif # endif # endif @@ -950,7 +956,10 @@ rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const c */ get_xdefaults (fd, name); - get_xdefaults (fd, APL_SUBCLASS); + get_xdefaults (fd, RESCLASS); +# ifdef RESFALLBACK + get_xdefaults (fd, RESFALLBACK); +# endif # if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) @@ -960,17 +969,16 @@ rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const c # if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) # endif - ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r"); + ad = fopen (XAPPLOADDIR "/" RESCLASS, "r"); if (ad != NULL) { - get_xdefaults (ad, APL_SUBCLASS); + get_xdefaults (ad, RESCLASS); get_xdefaults (ad, ""); fclose (ad); } } # endif /* XAPPLOADDIR */ - get_xdefaults (fd, APL_CLASS); get_xdefaults (fd, ""); /* partial match */ if (fd != NULL) fclose (fd);