*** empty log message ***

diff --git a/autoconf/config.h.in b/autoconf/config.h.in
index cde122be864110bb1e98bee23c4042ce03aaea92..aa43fa558ca7dd1956f90ea33f5fb1bf9721181b 100644 (file)
--- a/autoconf/config.h.in
+++ b/autoconf/config.h.in
@@ -1,463 +1,432 @@
-/* autoconf/config.h.in.  Generated from autoconf/configure.in by autoheader.  */
+/* autoconf/config.h.in.  Generated automatically from autoconf/configure.in by autoheader 2.13.  */
 
-/* Define if you want blinking cursor support */
-#undef CURSOR_BLINK
+/* 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 if you want chinese codesets */
-#undef ENCODING_CN
+/* Define to empty if the keyword does not work.  */
+#undef const
 
-/* Define if you want extended chinese codesets */
-#undef ENCODING_CN_EXT
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef gid_t
 
-/* Define if you want european extended codesets */
-#undef ENCODING_EU
+/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
+#undef HAVE_SYS_WAIT_H
 
-/* Define if you want japanese codesets */
-#undef ENCODING_JP
+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
 
-/* Define if you want extended japanese codesets */
-#undef ENCODING_JP_EXT
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef mode_t
 
-/* Define if you want korean codesets */
-#undef ENCODING_KR
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef pid_t
 
-/* Define if you want vietnamese codesets */
-#undef ENCODING_VN
+/* Define if you need to in order for stat and other things to work.  */
+#undef _POSIX_SOURCE
 
-/* Define if you want the depth of scrollbars and menus to be less */
-#undef HALFSHADOW
+/* Define as the return type of signal handlers (int or void).  */
+#undef RETSIGTYPE
 
-/* Define to 1 if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
 
-/* Define to 1 if you have the `atexit' function. */
-#undef HAVE_ATEXIT
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+#undef TIME_WITH_SYS_TIME
 
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef uid_t
 
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
+/* Define if the X Window System is missing or not being used.  */
+#undef X_DISPLAY_MISSING
 
-/* Define if you have _GNU_SOURCE getpt() */
-#undef HAVE_GETPT
+/* The number of bytes in a char.  */
+#undef SIZEOF_CHAR
 
-/* Define to 1 if you have the `grantpt' function. */
-#undef HAVE_GRANTPT
+/* The number of bytes in a int.  */
+#undef SIZEOF_INT
 
-/* Define to 1 if you have the <grp.h> header file. */
-#undef HAVE_GRP_H
+/* The number of bytes in a int *.  */
+#undef SIZEOF_INT_P
 
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
+/* The number of bytes in a long.  */
+#undef SIZEOF_LONG
 
-/* Define to 1 if you have the `isastream' function. */
-#undef HAVE_ISASTREAM
+/* The number of bytes in a long long.  */
+#undef SIZEOF_LONG_LONG
 
-/* Define to 1 if you have the <lastlog.h> header file. */
-#undef HAVE_LASTLOG_H
+/* The number of bytes in a short.  */
+#undef SIZEOF_SHORT
 
-/* Define to 1 if you have the <libc.h> header file. */
-#undef HAVE_LIBC_H
+/* Define if you have the _getpty function.  */
+#undef HAVE__GETPTY
 
-/* Define to 1 if you have the `Xft' library (-lXft). */
-#undef HAVE_LIBXFT
+/* Define if you have the atexit function.  */
+#undef HAVE_ATEXIT
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* Define if you have the grantpt function.  */
+#undef HAVE_GRANTPT
 
-/* Define to 1 if you have the `nanosleep' function. */
-#undef HAVE_NANOSLEEP
+/* Define if you have the isastream function.  */
+#undef HAVE_ISASTREAM
 
-/* Define if nl_langinfo(CODESET) works */
-#undef HAVE_NL_LANGINFO
+/* Define if you have the nanosleep function.  */
+#undef HAVE_NANOSLEEP
 
-/* Define to 1 if you have the `on_exit' function. */
+/* Define if you have the on_exit function.  */
 #undef HAVE_ON_EXIT
 
-/* Define to 1 if you have the `openpty' function. */
+/* Define if you have the openpty function.  */
 #undef HAVE_OPENPTY
 
-/* Define to 1 if you have the `revoke' function. */
+/* Define if you have the revoke function.  */
 #undef HAVE_REVOKE
 
-/* Define to 1 if you have the `seteuid' function. */
+/* Define if you have the seteuid function.  */
 #undef HAVE_SETEUID
 
-/* Define if plain old setlocale works */
-#undef HAVE_SETLOCALE
-
-/* Define to 1 if you have the `setpgid' function. */
+/* Define if you have the setpgid function.  */
 #undef HAVE_SETPGID
 
-/* Define to 1 if you have the `setpgrp' function. */
+/* Define if you have the setpgrp function.  */
 #undef HAVE_SETPGRP
 
-/* Define to 1 if you have the `setreuid' function. */
+/* Define if you have the setreuid function.  */
 #undef HAVE_SETREUID
 
-/* Define to 1 if you have the `setsid' function. */
+/* Define if you have the setsid function.  */
 #undef HAVE_SETSID
 
-/* Define to 1 if you have the `setutent' function. */
+/* Define if you have the setutent function.  */
 #undef HAVE_SETUTENT
 
-/* Define to 1 if you have the <stdarg.h> header file. */
-#undef HAVE_STDARG_H
+/* Define if you have the ttyslot function.  */
+#undef HAVE_TTYSLOT
 
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
+/* Define if you have the unlockpt function.  */
+#undef HAVE_UNLOCKPT
 
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+/* Define if you have the unsetenv function.  */
+#undef HAVE_UNSETENV
 
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
+/* Define if you have the updwtmp function.  */
+#undef HAVE_UPDWTMP
 
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
+/* Define if you have the <X11/Xft/Xft.h> header file.  */
+#undef HAVE_X11_XFT_XFT_H
 
-/* Define if utmp.h or lastlog.h has struct lastlog */
-#undef HAVE_STRUCT_LASTLOG
+/* Define if you have the <assert.h> header file.  */
+#undef HAVE_ASSERT_H
 
-/* Define if utmpx.h or lastlog.h has struct lastlogx */
-#undef HAVE_STRUCT_LASTLOGX
+/* Define if you have the <dlfcn.h> header file.  */
+#undef HAVE_DLFCN_H
 
-/* Define if utmp.h has struct utmp */
-#undef HAVE_STRUCT_UTMP
+/* Define if you have the <fcntl.h> header file.  */
+#undef HAVE_FCNTL_H
 
-/* Define if utmpx.h has struct utmpx */
-#undef HAVE_STRUCT_UTMPX
+/* Define if you have the <grp.h> header file.  */
+#undef HAVE_GRP_H
+
+/* Define if you have the <lastlog.h> header file.  */
+#undef HAVE_LASTLOG_H
+
+/* Define if you have the <libc.h> header file.  */
+#undef HAVE_LIBC_H
+
+/* Define if you have the <stdarg.h> header file.  */
+#undef HAVE_STDARG_H
 
-/* Define to 1 if you have the <sys/byteorder.h> header file. */
+/* Define if you have the <stdint.h> header file.  */
+#undef HAVE_STDINT_H
+
+/* Define if you have the <stdlib.h> header file.  */
+#undef HAVE_STDLIB_H
+
+/* Define if you have the <string.h> header file.  */
+#undef HAVE_STRING_H
+
+/* Define if you have the <sys/byteorder.h> header file.  */
 #undef HAVE_SYS_BYTEORDER_H
 
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
+/* Define if you have the <sys/ioctl.h> header file.  */
 #undef HAVE_SYS_IOCTL_H
 
-/* Define to 1 if you have the <sys/select.h> header file. */
+/* Define if you have the <sys/select.h> header file.  */
 #undef HAVE_SYS_SELECT_H
 
-/* Define to 1 if you have the <sys/sockio.h> header file. */
+/* Define if you have the <sys/sockio.h> header file.  */
 #undef HAVE_SYS_SOCKIO_H
 
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/strredir.h> header file. */
+/* Define if you have the <sys/strredir.h> header file.  */
 #undef HAVE_SYS_STRREDIR_H
 
-/* Define to 1 if you have the <sys/time.h> header file. */
+/* Define if you have the <sys/time.h> header file.  */
 #undef HAVE_SYS_TIME_H
 
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define to 1 if you have the <termios.h> header file. */
+/* Define if you have the <termios.h> header file.  */
 #undef HAVE_TERMIOS_H
 
-/* Define to 1 if you have the `ttyslot' function. */
-#undef HAVE_TTYSLOT
-
-/* Define to 1 if you have the <unistd.h> header file. */
+/* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if you have the `unlockpt' function. */
-#undef HAVE_UNLOCKPT
-
-/* Define to 1 if you have the `unsetenv' function. */
-#undef HAVE_UNSETENV
-
-/* Define to 1 if you have the `updwtmp' function. */
-#undef HAVE_UPDWTMP
+/* Define if you have the <utmp.h> header file.  */
+#undef HAVE_UTMP_H
 
-/* Define to 1 if you have the <utmpx.h> header file. */
+/* Define if you have the <utmpx.h> header file.  */
 #undef HAVE_UTMPX_H
 
-/* Define if struct utmpx contains ut_host */
-#undef HAVE_UTMPX_HOST
-
-/* Define to 1 if you have the <utmp.h> header file. */
-#undef HAVE_UTMP_H
+/* Define if you have the Xft library (-lXft).  */
+#undef HAVE_LIBXFT
 
-/* Define if struct utmp contains ut_host */
-#undef HAVE_UTMP_HOST
+/* Build shared library version - specify via configure only */
+#undef LIBRXVT
 
-/* Define if struct utmp contains ut_pid */
-#undef HAVE_UTMP_PID
+/* Define if you want the depth of scrollbars and menus to be less */
+#undef HALFSHADOW
 
-/* Define to 1 if you have the <X11/Xft/Xft.h> header file. */
-#undef HAVE_X11_XFT_XFT_H
+/* Define to change gid of ttys to group tty */
+#undef TTY_GID_SUPPORT
 
-/* Define if Xlocale support works */
-#undef HAVE_XLOCALE
+/* Define if you don't want support for the backspace key */
+#undef NO_BACKSPACE_KEY
 
-/* Define if you have XPointer typedef */
-#undef HAVE_XPOINTER
+/* Define if you don't want support for the (non-keypad) delete key */
+#undef NO_DELETE_KEY
 
-/* Define if setlocale (defined to Xsetlocale) works */
-#undef HAVE_XSETLOCALE
+/* Define if you don't want any resources read */
+#undef NO_RESOURCES
 
-/* Define to 1 if you have the `_getpty' function. */
-#undef HAVE__GETPTY
+/* Define if you want to use XGetDefault instead of our internal version */
+#undef USE_XGETDEFAULT
 
-/* Define if lastlog is provided via a directory */
-#undef LASTLOG_IS_DIR
+/* Fallback resource class */
+#undef RESFALLBACK
 
-/* Define if you want to have lastlog support when utmp/utmpx is enabled */
-#undef LASTLOG_SUPPORT
+/* Default resource name */
+#undef RESNAME
 
-/* Build shared library version - specify via configure only */
-#undef LIBRXVT
+/* Resource class */
+#undef RESCLASS
 
-/* Define if you want Menubar support */
-#undef MENUBAR
+/* Disable the secondary screen. Many programs use the secondary screen as their workplace */
+#undef NO_SECONDARY_SCREEN
 
-/* Define to have CTRL cause wheel events to accelerate scrolling. Release
-   CTRL to halt scrolling */
-#undef MOUSE_SLIP_WHEELING
+/* Define to remove xterm style mouse selection */
+#undef NO_NEW_SELECTION
 
-/* Define to use wheel events (button4 and button5) to scroll */
-#undef MOUSE_WHEEL
+/* Define to use smart resize behavior */
+#undef SMART_RESIZE
 
-/* Support NeXT style scrollbars */
-#undef NEXT_SCROLLBAR
+/* Define if you want 256 colour support */
+#undef TTY_256COLOR
 
-/* Define if you don't want support for the backspace key */
-#undef NO_BACKSPACE_KEY
+/* Set TERM to the value given by configure */
+#undef TERMENV
 
-/* Define if you don't want support for the (non-keypad) delete key */
-#undef NO_DELETE_KEY
+/* Set TERMINFO value to the value given by configure */
+#undef RXVT_TERMINFO
 
-/* Define if you don't want handling for rarely used features */
-#undef NO_FRILLS
+/* Define if you need function prototypes */
+#undef PROTOTYPES
 
-/* Define if you don't want support linespace */
-#undef NO_LINESPACE
+/* Define if you include <X11/xpm.h> on a normal include path (be careful) */
+#undef XPM_INC_X11
 
-/* Define to remove xterm style mouse selection */
-#undef NO_NEW_SELECTION
+/* Define if you have XPointer typedef */
+#undef HAVE_XPOINTER
 
-/* Define to remove old rxvt (ver 2.20 and before) style selection */
-#undef NO_OLD_SELECTION
+/* Define if utmp.h has struct utmp */
+#undef HAVE_STRUCT_UTMP
 
-/* Define if you don't want any resources read */
-#undef NO_RESOURCES
+/* Define if struct utmp contains ut_host */
+#undef HAVE_UTMP_HOST
 
-/* Define for continual scrolling when you keep the scrollbar button pressed
-   */
-#undef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
+/* Define if struct utmp contains ut_pid */
+#undef HAVE_UTMP_PID
 
-/* Disable the secondary screen. Many programs use the secondary screen as
-   their workplace */
-#undef NO_SECONDARY_SCREEN
+/* Define if utmpx.h has struct utmpx */
+#undef HAVE_STRUCT_UTMPX
 
-/* Define if you don't need to use our replacement string functions */
-#undef NO_STRINGS
+/* Define if struct utmpx contains ut_host */
+#undef HAVE_UTMPX_HOST
 
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
+/* Define if utmp.h or lastlog.h has struct lastlog */
+#undef HAVE_STRUCT_LASTLOG
 
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
+/* Define if utmpx.h or lastlog.h has struct lastlogx */
+#undef HAVE_STRUCT_LASTLOGX
 
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
+/* Define location of utmp */
+#undef RXVT_UTMP_FILE
 
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
+/* Define location of utmpx */
+#undef RXVT_UTMPX_FILE
 
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
+/* Define location of wtmp */
+#undef RXVT_WTMP_FILE
 
-/* Support plain style scrollbars */
-#undef PLAIN_SCROLLBAR
+/* Define location of wtmpx */
+#undef RXVT_WTMPX_FILE
 
-/* Define if you want hide the pointer while typing */
-#undef POINTER_BLANK
+/* Define location of lastlog */
+#undef RXVT_LASTLOG_FILE
 
-/* Define to use a 24 bit visual if the screen has 24 bit mode */
-#undef PREFER_24BIT
+/* Define if lastlog is provided via a directory */
+#undef LASTLOG_IS_DIR
 
-/* Define if you need function prototypes */
-#undef PROTOTYPES
+/* Define location of lastlogx */
+#undef RXVT_LASTLOGX_FILE
 
-/* Define for first char in devptyXX */
-#undef PTYCHAR1
+/* Define location of ttys/ttytab */
+#undef TTYTAB_FILENAME
 
-/* Define for second char in devptyXX */
-#undef PTYCHAR2
+/* Define if Xlocale support works */
+#undef HAVE_XLOCALE
 
-/* Define for this pty type */
-#undef PTYS_ARE_CLONE
+/* Define if setlocale (defined to Xsetlocale) works */
+#undef HAVE_XSETLOCALE
 
-/* Define for this pty type */
-#undef PTYS_ARE_GETPT
+/* Define if plain old setlocale works */
+#undef HAVE_SETLOCALE
 
-/* Define for this pty type */
-#undef PTYS_ARE_GETPTY
+/* Define if nl_langinfo(CODESET) works */
+#undef HAVE_NL_LANGINFO
 
-/* Define for this pty type */
-#undef PTYS_ARE_NUMERIC
+/* Define if you have _GNU_SOURCE getpt()  */
+#undef HAVE_GETPT
 
 /* Define for this pty type */
 #undef PTYS_ARE_OPENPTY
 
 /* Define for this pty type */
-#undef PTYS_ARE_PTC
+#undef PTYS_ARE_NUMERIC
 
 /* Define for this pty type */
 #undef PTYS_ARE_PTMX
 
 /* Define for this pty type */
-#undef PTYS_ARE_SEARCHED
+#undef PTYS_ARE_PTC
 
 /* Define for this pty type */
 #undef PTYS_ARE__GETPTY
 
-/* Resource class */
-#undef RESCLASS
+/* Define for this pty type */
+#undef PTYS_ARE_GETPTY
 
-/* Fallback resource class */
-#undef RESFALLBACK
+/* Define for this pty type */
+#undef PTYS_ARE_GETPT
 
-/* Default resource name */
-#undef RESNAME
+/* Define for this pty type */
+#undef PTYS_ARE_CLONE
 
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
+/* Define for this pty type */
+#undef PTYS_ARE_SEARCHED
 
-/* Define location of lastlogx */
-#undef RXVT_LASTLOGX_FILE
+/* Define for first char in devptyXX */
+#undef PTYCHAR1
 
-/* Define location of lastlog */
-#undef RXVT_LASTLOG_FILE
+/* Define for second char in devptyXX */
+#undef PTYCHAR2
 
-/* Support Rxvt original style scrollbars */
-#undef RXVT_SCROLLBAR
+/* Define if you want your background to use the parent window background */
+#undef TRANSPARENT
 
-/* Set TERMINFO value to the value given by configure */
-#undef RXVT_TERMINFO
+/* Define for continual scrolling when you keep the scrollbar button pressed */
+#undef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
 
-/* Define location of utmpx */
-#undef RXVT_UTMPX_FILE
+/* Define to allow scrolling when the selection moves to the top or bottom of the screen */
+#undef SELECTION_SCROLLING
 
-/* Define location of utmp */
-#undef RXVT_UTMP_FILE
+/* Define if you want Menubar support */
+#undef MENUBAR
 
-/* Define location of wtmpx */
-#undef RXVT_WTMPX_FILE
+/* Define if you don't want handling for rarely used features */
+#undef NO_FRILLS
 
-/* Define location of wtmp */
-#undef RXVT_WTMP_FILE
+/* Define if you don't want support linespace */
+#undef NO_LINESPACE
 
-/* Define to allow scrolling when the selection moves to the top or bottom of
-   the screen */
-#undef SELECTION_SCROLLING
+/* Define to use a 24 bit visual if the screen has 24 bit mode */
+#undef PREFER_24BIT
 
-/* The size of a `char', as computed by sizeof. */
-#undef SIZEOF_CHAR
+/* Define to use wheel events (button4 and button5) to scroll */
+#undef MOUSE_WHEEL
 
-/* The size of a `int', as computed by sizeof. */
-#undef SIZEOF_INT
+/* Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling */
+#undef MOUSE_SLIP_WHEELING
 
-/* The size of a `int *', as computed by sizeof. */
-#undef SIZEOF_INT_P
+/* Define to remove old rxvt (ver 2.20 and before) style selection */
+#undef NO_OLD_SELECTION
 
-/* The size of a `long', as computed by sizeof. */
-#undef SIZEOF_LONG
+/* Define if you want to have utmp/utmpx support */
+#undef UTMP_SUPPORT
 
-/* The size of a `long long', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG
+/* Define if you want to have wtmp support when utmp/utmpx is enabled */
+#undef WTMP_SUPPORT
 
-/* The size of a `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
+/* Define if you want to have lastlog support when utmp/utmpx is enabled */
+#undef LASTLOG_SUPPORT
 
-/* Define to use "smart" resize behavior */
-#undef SMART_RESIZE
+/* Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input */
+#undef USE_XIM
 
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define if you want to have sexy-looking background pixmaps. Needs libXpm */
+#undef XPM_BACKGROUND
 
-/* Set TERM to the value given by configure */
-#undef TERMENV
+/* Support Rxvt original style scrollbars */
+#undef RXVT_SCROLLBAR
 
-/* Define if you want blinking text support */
-#undef TEXT_BLINK
+/* Support NeXT style scrollbars */
+#undef NEXT_SCROLLBAR
 
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
+/* Support Xterm style scrollbars */
+#undef XTERM_SCROLLBAR
 
-/* Define if you want your background to use the parent window background */
-#undef TRANSPARENT
+/* Support plain style scrollbars */
+#undef PLAIN_SCROLLBAR
 
-/* Define location of ttys/ttytab */
-#undef TTYTAB_FILENAME
+/* Define if you want hide the pointer while typing */
+#undef POINTER_BLANK
 
-/* Define if you want 256 colour support */
-#undef TTY_256COLOR
+/* Define if you want blinking cursor support */
+#undef CURSOR_BLINK
 
-/* Define to change gid of ttys to group tty */
-#undef TTY_GID_SUPPORT
+/* 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 if you want to use XGetDefault instead of our internal version */
-#undef USE_XGETDEFAULT
-
-/* Define if you want to have XIM (X Input Method) protocol support - required
-   for multibyte characters input */
-#undef USE_XIM
-
-/* 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 automatically compose combining characters */
+#undef ENCODING_COMPOSE
 
-/* Define if you want to have sexy-looking background pixmaps. Needs libXpm */
-#undef XPM_BACKGROUND
-
-/* Define if you include <X11/xpm.h> on a normal include path (be careful) */
-#undef XPM_INC_X11
+/* Define if you want european extended codesets */
+#undef ENCODING_EU
 
-/* Support Xterm style scrollbars */
-#undef XTERM_SCROLLBAR
+/* Define if you want vietnamese codesets */
+#undef ENCODING_VN
 
-/* Define to 1 if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
+/* Define if you want japanese codesets */
+#undef ENCODING_JP
 
-/* 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 if you want extended japanese codesets */
+#undef ENCODING_JP_EXT
 
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
+/* Define if you want korean codesets */
+#undef ENCODING_KR
 
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef gid_t
+/* Define if you want chinese codesets */
+#undef ENCODING_CN
 
-/* 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 if you want extended chinese codesets */
+#undef ENCODING_CN_EXT
 
-/* Define to `int' if <sys/types.h> does not define. */
-#undef mode_t
+/* Define if you don't need to use our replacement string functions */
+#undef NO_STRINGS
 
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
+/* Define to enable xft support */
+#undef XFT
 
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef uid_t

diff --git a/autoconf/configure.in b/autoconf/configure.in
index 981130a20dad4eb6d6645e355aef9db3f10f4d1f..1785af6067d749976105f55c6b83c175e44cc896 100644 (file)
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -82,6 +82,7 @@ support_xim=no
 support_xpm=no
 support_xft=no
 support_unicode3=no
+support_combining=no
 codesets=
 
 dnl# --------------------------------------------------------------------------
@@ -123,6 +124,7 @@ AC_ARG_ENABLE(everything,
     support_xpm=yes
     support_xft=yes
     support_unicode3=yes
+    support_combining=yes
     codesets=all
   fi])
 
@@ -132,6 +134,12 @@ AC_ARG_ENABLE(unicode3,
     support_unicode3=yes
   fi])
 
+AC_ARG_ENABLE(combining,
+  [  --enable-combining      enable composition of base and combining characters],
+  [if test x$enableval = xyes -o x$enableval = xno; then
+    support_combining=yes
+  fi])
+
 AC_ARG_ENABLE(xft,
   [  --enable-xft            enable xft support on systems that have it],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -1233,8 +1241,11 @@ fi
 if test x$support_unicode3 = xyes; then
   AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0)
 fi
+if test x$support_combining = xyes; then
+  AC_DEFINE(ENCODING_COMPOSE, 1, Define if you want to automatically compose combining characters)
+fi
 if test x$codesets = xall; then
-  codesets=jp,jp-ext,kr,cn,cn-ext,vn
+  codesets=jp,jp-ext,kr,cn,cn-ext
 fi
 for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
   AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)

diff --git a/reconf b/reconf
index 41cc3a7ea6c1ebf23811e02effbabfa6589d1109..bdafeee9e16c7230e1f8f3bc6e8fa40c1cf23716 100755 (executable)
--- a/reconf
+++ b/reconf
@@ -10,5 +10,5 @@
             --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 --enable-combining \
             "$@"

diff --git a/src/defaultfont.C b/src/defaultfont.C
index 2a1ba974d0ce33b582ff94fd2628a1f4f651ec88..e425eae6c3d8d167304f0676e80f6800de5a0e07 100644 (file)
--- a/src/defaultfont.C
+++ b/src/defaultfont.C
@@ -1099,7 +1099,6 @@ bool
 rxvt_fontset::populate (const char *desc)
 {
   clear ();
-  printf ("P(%s)\n",desc);
 
   fonts.push_back (new_font (0, CS_UNICODE));
   realize_font (0);

diff --git a/src/gencompose b/src/gencompose
index 75c400296c7d84dedcac2797aac7f9616fc31065..4ddb59dbe6d883cda4b10d805a8d1d4641139979 100755 (executable)
--- a/src/gencompose
+++ b/src/gencompose
@@ -10,9 +10,9 @@ print TABLE <<EOF;
 // AUTOMATICALLLY GENERATED by gencompose
 //
 
-struct rxvt_compose {
+struct rxvt_compose_entry {
    uint32_t c1, c2, r;
-} rxvt_compose_table = {
+} rxvt_compose_table[] = {
 #ifdef ENCODING_COMPOSE
 EOF
 
@@ -32,14 +32,10 @@ while (<UNIDATA>) {
 for (sort { $a->[0] cmp $b->[0] } @compose) {
    next if $seen{$_->[1],$_->[2]}++;
    printf TABLE " { 0x%05x, 0x%05x, 0x%05x },\n", $_->[1], $_->[2], $_->[3];
-   $count++;
 }
 
 
 print TABLE <<EOF;
-#define ENCODING_COMPOSE_COUNT $count
-#else
-#define ENCODING_COMPOSE_COUNT 0
 #endif
 };
 EOF

diff --git a/src/table/compose.h b/src/table/compose.h
index 6a0caf84b90590db53ba46210e03f2b9b298f7b9..58ecb88a99bbb9ee674251ceef32476ff08f3954 100644 (file)
--- a/src/table/compose.h
+++ b/src/table/compose.h
@@ -2,9 +2,9 @@
 // AUTOMATICALLLY GENERATED by gencompose
 //
 
-struct rxvt_compose {
+struct rxvt_compose_entry {
    uint32_t c1, c2, r;
-} rxvt_compose_table = {
+} rxvt_compose_table[] = {
 #ifdef ENCODING_COMPOSE
  { 0x00020, 0x00301, 0x000b4 },
  { 0x00020, 0x00303, 0x002dc },
@@ -1306,8 +1306,5 @@ struct rxvt_compose {
  { 0x1d1bb, 0x1d16f, 0x1d1bf },
  { 0x1d1bc, 0x1d16e, 0x1d1be },
  { 0x1d1bc, 0x1d16f, 0x1d1c0 },
-#define ENCODING_COMPOSE_COUNT 1300
-#else
-#define ENCODING_COMPOSE_COUNT 0
 #endif
 };