*** empty log message ***

diff --git a/Changes b/Changes
index d96e8191ff2d51fa798a34043148cd6d10096eaa..b82d910237b02cb3ca612c997b71b06fd20928b4 100644 (file)
--- a/Changes
+++ b/Changes
@@ -2,6 +2,8 @@
        - almost total conversion to C++. Except for introducing
           new bugs, this should not change much.
         - fix and re-enable background pixmap and inherit pixmap support.
+        - re-enabled multiple scrollbar support.
+        - blinking and selections wrk slightly better now.
 
 1.7  Fri Jan 30 16:50:11 CET 2004
        - further cleanups.

diff --git a/autoconf/config.h.in b/autoconf/config.h.in
index 6ebbdc70aad5eb74801a21be83f5e5a8e5d6c787..9dce008c995d1190e2d5e0d6a4d6cdbec9fd5bde 100644 (file)
--- a/autoconf/config.h.in
+++ b/autoconf/config.h.in
@@ -1,423 +1,460 @@
-/* autoconf/config.h.in.  Generated automatically from 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 if you want blinking cursor support */
+#undef CURSOR_BLINK
 
-/* Define to empty if the keyword does not work.  */
-#undef const
+/* Define if you want chinese codesets */
+#undef ENCODING_CN
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef gid_t
+/* Define if you want extended chinese codesets */
+#undef ENCODING_CN_EXT
 
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
-#undef HAVE_SYS_WAIT_H
+/* Define if you want european extended codesets */
+#undef ENCODING_EU
 
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
+/* Define if you want japanese codesets */
+#undef ENCODING_JP
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef mode_t
+/* Define if you want extended japanese codesets */
+#undef ENCODING_JP_EXT
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef pid_t
+/* Define if you want korean codesets */
+#undef ENCODING_KR
 
-/* Define if you need to in order for stat and other things to work.  */
-#undef _POSIX_SOURCE
+/* Define if you want vietnamese codesets */
+#undef ENCODING_VN
 
-/* Define as the return type of signal handlers (int or void).  */
-#undef RETSIGTYPE
+/* Define if you want support for Greek Elot-928 & IBM-437 keyboard */
+#undef GREEK_SUPPORT
 
-/* 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 <sys/time.h> and <time.h>.  */
-#undef TIME_WITH_SYS_TIME
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
 
-/* Define to `int' if <sys/types.h> 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 <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
 
-/* The number of bytes in a char.  */
-#undef SIZEOF_CHAR
+/* Define to 1 if you have the <fcntl.h> 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 <grp.h> 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 <inttypes.h> 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 <lastlog.h> header file. */
+#undef HAVE_LASTLOG_H
 
-/* Define if you have the atexit function.  */
-#undef HAVE_ATEXIT
+/* Define to 1 if you have the <libc.h> 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 <memory.h> 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 <X11/Xft/Xft.h> header file.  */
-#undef HAVE_X11_XFT_XFT_H
-
-/* Define if you have the <assert.h> header file.  */
-#undef HAVE_ASSERT_H
-
-/* Define if you have the <dlfcn.h> header file.  */
-#undef HAVE_DLFCN_H
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
 
-/* Define if you have the <fcntl.h> header file.  */
-#undef HAVE_FCNTL_H
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
 
-/* Define if you have the <grp.h> header file.  */
-#undef HAVE_GRP_H
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
 
-/* Define if you have the <lastlog.h> header file.  */
-#undef HAVE_LASTLOG_H
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
 
-/* Define if you have the <libc.h> header file.  */
-#undef HAVE_LIBC_H
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
 
-/* Define if you have the <stdarg.h> 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 <stdint.h> 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 <stdlib.h> header file.  */
-#undef HAVE_STDLIB_H
+/* Define if utmp.h has struct utmp */
+#undef HAVE_STRUCT_UTMP
 
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
+/* Define if utmpx.h has struct utmpx */
+#undef HAVE_STRUCT_UTMPX
 
-/* Define if you have the <sys/byteorder.h> header file.  */
+/* Define to 1 if you have the <sys/byteorder.h> header file. */
 #undef HAVE_SYS_BYTEORDER_H
 
-/* Define if you have the <sys/ioctl.h> header file.  */
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
 #undef HAVE_SYS_IOCTL_H
 
-/* Define if you have the <sys/select.h> header file.  */
+/* Define to 1 if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 
-/* Define if you have the <sys/sockio.h> header file.  */
+/* Define to 1 if you have the <sys/sockio.h> header file. */
 #undef HAVE_SYS_SOCKIO_H
 
-/* Define if you have the <sys/strredir.h> header file.  */
+/* 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. */
 #undef HAVE_SYS_STRREDIR_H
 
-/* Define if you have the <sys/time.h> header file.  */
+/* Define to 1 if you have the <sys/time.h> header file. */
 #undef HAVE_SYS_TIME_H
 
-/* Define if you have the <termios.h> header file.  */
+/* 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. */
 #undef HAVE_TERMIOS_H
 
-/* Define if you have the <unistd.h> header file.  */
+/* Define to 1 if you have the `ttyslot' function. */
+#undef HAVE_TTYSLOT
+
+/* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define if you have the <utmp.h> header file.  */
-#undef HAVE_UTMP_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 if you have the <utmpx.h> header file.  */
+/* Define to 1 if you have the `updwtmp' function. */
+#undef HAVE_UPDWTMP
+
+/* Define to 1 if you have the <utmpx.h> header file. */
 #undef HAVE_UTMPX_H
 
-/* Define if you have the Xft library (-lXft).  */
-#undef HAVE_LIBXFT
+/* Define if struct utmpx contains ut_host */
+#undef HAVE_UTMPX_HOST
 
-/* Build shared library version - specify via configure only */
-#undef LIBRXVT
+/* Define to 1 if you have the <utmp.h> header file. */
+#undef HAVE_UTMP_H
 
-/* Define default multichar glyph encoding */
-#undef MULTICHAR_ENCODING
+/* Define if struct utmp contains ut_host */
+#undef HAVE_UTMP_HOST
 
-/* Define if you want the depth of scrollbars and menus to be less */
-#undef HALFSHADOW
+/* Define if struct utmp contains ut_pid */
+#undef HAVE_UTMP_PID
 
-/* Define if you want support for Greek Elot-928 & IBM-437 keyboard */
-#undef GREEK_SUPPORT
+/* 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
 
-/* Disable the secondary screen. Many programs use the secondary screen as their workplace */
-#undef NO_SECONDARY_SCREEN
+/* Define if you want to have lastlog support when utmp/utmpx is enabled */
+#undef LASTLOG_SUPPORT
 
-/* Define to remove xterm style mouse selection */
-#undef NO_NEW_SELECTION
+/* Build shared library version - specify via configure only */
+#undef LIBRXVT
 
-/* Define to use smart resize behavior */
-#undef SMART_RESIZE
+/* Define if you want Menubar support */
+#undef MENUBAR
 
-/* Define if you want 256 colour support */
-#undef TTY_256COLOR
+/* Define to have CTRL cause wheel events to accelerate scrolling. Release
+   CTRL to halt scrolling */
+#undef MOUSE_SLIP_WHEELING
 
-/* Set TERM to the value given by configure */
-#undef TERMENV
+/* Define to use wheel events (button4 and button5) to scroll */
+#undef MOUSE_WHEEL
 
-/* Set TERMINFO value to the value given by configure */
-#undef RXVT_TERMINFO
+/* Define default multichar glyph encoding */
+#undef MULTICHAR_ENCODING
 
-/* Define if you need function prototypes */
-#undef PROTOTYPES
+/* Support NeXT style scrollbars */
+#undef NEXT_SCROLLBAR
 
-/* Define if you include <X11/xpm.h> on a normal include path (be careful) */
-#undef XPM_INC_X11
+/* 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 utmp.h has struct utmp */
-#undef HAVE_STRUCT_UTMP
+/* Define if you don't want handling for rarely used features */
+#undef NO_FRILLS
 
-/* Define if struct utmp contains ut_host */
-#undef HAVE_UTMP_HOST
+/* Define if you don't want support linespace */
+#undef NO_LINESPACE
 
-/* Define if struct utmp contains ut_pid */
-#undef HAVE_UTMP_PID
+/* Define to remove xterm style mouse selection */
+#undef NO_NEW_SELECTION
 
-/* Define if utmpx.h has struct utmpx */
-#undef HAVE_STRUCT_UTMPX
+/* Define to remove old rxvt (ver 2.20 and before) style selection */
+#undef NO_OLD_SELECTION
 
-/* Define if struct utmpx contains ut_host */
-#undef HAVE_UTMPX_HOST
+/* Define if you don't want any resources read */
+#undef NO_RESOURCES
 
-/* Define if utmp.h or lastlog.h has struct lastlog */
-#undef HAVE_STRUCT_LASTLOG
+/* Define for continual scrolling when you keep the scrollbar button pressed
+   */
+#undef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
 
-/* Define if utmpx.h or lastlog.h has struct lastlogx */
-#undef HAVE_STRUCT_LASTLOGX
+/* Disable the secondary screen. Many programs use the secondary screen as
+   their workplace */
+#undef NO_SECONDARY_SCREEN
 
-/* Define location of utmp */
-#undef RXVT_UTMP_FILE
+/* Define if you don't need to use our replacement string functions */
+#undef NO_STRINGS
 
-/* Define location of utmpx */
-#undef RXVT_UTMPX_FILE
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
 
-/* Define location of wtmp */
-#undef RXVT_WTMP_FILE
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
 
-/* Define location of wtmpx */
-#undef RXVT_WTMPX_FILE
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
 
-/* Define location of lastlog */
-#undef RXVT_LASTLOG_FILE
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
 
-/* Define if lastlog is provided via a directory */
-#undef LASTLOG_IS_DIR
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
 
-/* Define location of lastlogx */
-#undef RXVT_LASTLOGX_FILE
+/* 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 Xlocale support works */
-#undef HAVE_XLOCALE
+/* Define to use a 24 bit visual if the screen has 24 bit mode */
+#undef PREFER_24BIT
 
-/* Define if setlocale (defined to Xsetlocale) works */
-#undef HAVE_XSETLOCALE
+/* Define if you need function prototypes */
+#undef PROTOTYPES
 
-/* Define if plain old setlocale works */
-#undef HAVE_SETLOCALE
+/* Define for first char in devptyXX */
+#undef PTYCHAR1
 
-/* Define if nl_langinfo(CODESET) works */
-#undef HAVE_NL_LANGINFO
+/* Define for second char in devptyXX */
+#undef PTYCHAR2
 
-/* Define if you have _GNU_SOURCE getpt()  */
-#undef HAVE_GETPT
+/* Define for this pty type */
+#undef PTYS_ARE_CLONE
 
 /* Define for this pty type */
-#undef PTYS_ARE_OPENPTY
+#undef PTYS_ARE_GETPT
+
+/* Define for this pty type */
+#undef PTYS_ARE_GETPTY
 
 /* Define for this pty type */
 #undef PTYS_ARE_NUMERIC
 
 /* Define for this pty type */
-#undef PTYS_ARE_PTMX
+#undef PTYS_ARE_OPENPTY
 
 /* Define for this pty type */
 #undef PTYS_ARE_PTC
 
 /* Define for this pty type */
-#undef PTYS_ARE__GETPTY
+#undef PTYS_ARE_PTMX
 
 /* Define for this pty type */
-#undef PTYS_ARE_GETPTY
+#undef PTYS_ARE_SEARCHED
 
 /* Define for this pty type */
-#undef PTYS_ARE_GETPT
+#undef PTYS_ARE__GETPTY
 
-/* 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
 
-/* Define if you want hide the pointer while typing */
-#undef POINTER_BLANK
+/* Define location of ttys/ttytab */
+#undef TTYTAB_FILENAME
 
-/* Define if you want blinking cursor support */
-#undef CURSOR_BLINK
+/* Define if you want 256 colour support */
+#undef TTY_256COLOR
 
-/* Define if you want blinking text support */
-#undef TEXT_BLINK
+/* Define to change gid of ttys to group tty */
+#undef TTY_GID_SUPPORT
 
 /* Define if you want to represent unicode characters outside plane 0 */
 #undef UNICODE_3
 
-/* Define if you want europeean extended codesets */
-#undef ENCODING_EU
+/* Define if you want to use XGetDefault instead of our internal version */
+#undef USE_XGETDEFAULT
 
-/* Define if you want vietnamese codesets */
-#undef ENCODING_VN
+/* Define if you want to have XIM (X Input Method) protocol support - required
+   for multibyte characters input */
+#undef USE_XIM
 
-/* Define if you want japanese codesets */
-#undef ENCODING_JP
+/* Define if you want to have utmp/utmpx support */
+#undef UTMP_SUPPORT
 
-/* Define if you want extended japanese codesets */
-#undef ENCODING_JP_EXT
+/* Define if you want to have wtmp support when utmp/utmpx is enabled */
+#undef WTMP_SUPPORT
 
-/* Define if you want korean codesets */
-#undef ENCODING_KR
+/* Define to enable xft support */
+#undef XFT
 
-/* Define if you want chinese codesets */
-#undef ENCODING_CN
+/* Define if you want to have sexy-looking background pixmaps. Needs libXpm */
+#undef XPM_BACKGROUND
 
-/* Define if you want extended chinese codesets */
-#undef ENCODING_CN_EXT
+/* Define if you include <X11/xpm.h> on a normal include path (be careful) */
+#undef XPM_INC_X11
 
-/* Define if you don't need to use our replacement string functions */
-#undef NO_STRINGS
+/* Support Xterm style scrollbars */
+#undef XTERM_SCROLLBAR
 
-/* Define to enable xft support */
-#undef XFT
+/* 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 <sys/types.h> 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 <sys/types.h> does not define. */
+#undef mode_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef uid_t

diff --git a/autoconf/configure.in b/autoconf/configure.in
index 14b6f27edf68ead937f7775a2207d65a3168bf98..636e6b158791301baea99aa827f81400c2dbca33 100644 (file)
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -58,6 +58,7 @@ support_pointer_blank=no
 support_scroll_rxvt=no
 support_scroll_next=no
 support_scroll_xterm=no
+support_scroll_plain=no
 support_xim=no
 support_xpm=no
 support_xft=no
@@ -96,6 +97,7 @@ AC_ARG_ENABLE(everything,
     support_scroll_rxvt=yes
     support_scroll_next=yes
     support_scroll_xterm=yes
+    support_scroll_plain=yes
     support_utmp=yes
     support_wtmp=yes
     support_xim=yes
@@ -192,6 +194,12 @@ AC_ARG_ENABLE(xterm-scroll,
     support_scroll_xterm=$enableval
   fi])
 
+AC_ARG_ENABLE(plain-scroll,
+  [  --enable-plain-scroll   enable plain style scrollbar],
+  [if test x$enableval = xyes -o x$enableval = xno; then
+    support_scroll_plain=$enableval
+  fi])
+
 AC_ARG_ENABLE(half-shadow,
   [  --enable-half-shadow    use half width/height shadow on rxvt scrollbar],
   [if test x$enableval = xyes; then
@@ -1180,6 +1188,10 @@ if test x$support_scroll_xterm = xyes; then
   AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars)
   scrolltypes="$scrolltypes xterm"
 fi
+if test x$support_scroll_plain = xyes; then
+  AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
+  scrolltypes="$scrolltypes plain"
+fi
 if test x$support_pointer_blank = xyes; then
   AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing)
 fi

diff --git a/src/Makefile.in b/src/Makefile.in
index 61d04201254b38a8092937602648a0d4327408bf..a428c3fea0f7c2b0f371dcf374a083c9a92f5ab8 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.9 2004-01-28 23:48:02 pcg Exp $
+# $Id: Makefile.in,v 1.10 2004-01-31 04:12:10 pcg Exp $
 @MCOMMON@
 
 LINT = lint -DNARROWPROTO=1 $(XINC) -chapbxz
@@ -27,7 +27,8 @@ dummy:
 LIBSRCS = command.C defaultfont.C grkelot.C init.C logging.C \
        main.C menubar.C misc.C netdisp.C ptytty.C screen.C scrollbar.C \
        scrollbar-rxvt.C scrollbar-next.C scrollbar-xterm.C strings.C \
-       xdefaults.C xpm.C encoding.C rxvtcolor.C rxvtstl.C iom.C
+       xdefaults.C xpm.C encoding.C rxvtcolor.C rxvtstl.C iom.C \
+       scrollbar-plain.C
 
 SRCS =  rxvt.C $(LIBSRCS)
 
@@ -39,11 +40,11 @@ EXTRAHDRS = rxvtlib.h rxvtdaemon.h
 
 OBJS = command.o defaultfont.o init.o grkelot.o logging.o \
        main.o menubar.o misc.o netdisp.o ptytty.o screen.o \
-       scrollbar.o scrollbar-next.o scrollbar-rxvt.o scrollbar-xterm.o \
+       scrollbar.o scrollbar-next.o scrollbar-rxvt.o scrollbar-xterm.o scrollbar-plain.o \
        strings.o xdefaults.o xpm.o rxvt.o encoding.o rxvtcolor.o rxvtstl.o iom.o
 LIBOBJS = command.lo defaultfont.lo init.lo grkelot.lo logging.lo \
        main.lo menubar.lo misc.lo netdisp.lo ptytty.lo screen.lo \
-       scrollbar.lo scrollbar-next.lo scrollbar-rxvt.lo scrollbar-xterm.lo \
+       scrollbar.lo scrollbar-next.lo scrollbar-rxvt.lo scrollbar-xterm.lo scrollbar-plain.lo \
        strings.lo xdefaults.lo xpm.lo encoding.lo rxvt.lo rxvtcolor.lo rxvtstl.lo iom.lo
 
 LIBVERSION = @LIBVERSION@
@@ -61,13 +62,13 @@ RXVT_OLDNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)-old$(EXEEXT)
 EXTPROS = command.extpro defaultfont.extpro grkelot.extpro \
        init.extpro logging.extpro main.extpro menubar.extpro misc.extpro \
        netdisp.extpro ptytty.extpro screen.extpro scrollbar.extpro \
-       scrollbar-rxvt.extpro scrollbar-next.extpro scrollbar-xterm.extpro \
+       scrollbar-rxvt.extpro scrollbar-next.extpro scrollbar-xterm.extpro scrollbar-plain.intpro \
        strings.extpro xdefaults.extpro xpm.extpro
 
 INTPROS = command.intpro defaultfont.intpro grkelot.intpro \
        init.intpro logging.intpro main.intpro menubar.intpro misc.intpro \
        netdisp.intpro ptytty.intpro screen.intpro scrollbar.intpro \
-       scrollbar-rxvt.intpro scrollbar-next.intpro scrollbar-xterm.intpro \
+       scrollbar-rxvt.intpro scrollbar-next.intpro scrollbar-xterm.intpro scrollbar-plain.intpro \
        strings.intpro xdefaults.intpro xpm.intpro
 
 DEPS =  rxvt.h rxvtlib.h ${basedir}/config.h feature.h .protos
@@ -206,6 +207,7 @@ scrollbar.o:        scrollbar.C $(DEPS) scrollbar.intpro
 scrollbar-rxvt.o:   scrollbar-rxvt.C  $(DEPS) scrollbar-rxvt.intpro
 scrollbar-next.o:   scrollbar-next.C  $(DEPS) scrollbar-next.intpro
 scrollbar-xterm.o:  scrollbar-xterm.C $(DEPS) scrollbar-xterm.intpro
+scrollbar-plain.o:  scrollbar-plain.C $(DEPS) scrollbar-plain.intpro
 strings.o:          strings.C   $(DEPS) strings.intpro
 xdefaults.o:        xdefaults.C $(DEPS) xdefaults.intpro         version.h
 xpm.o:              xpm.C       $(DEPS) xpm.intpro
@@ -229,6 +231,7 @@ scrollbar.lo:       scrollbar.C $(DEPS) scrollbar.intpro
 scrollbar-rxvt.lo:  scrollbar-rxvt.C  $(DEPS) scrollbar-rxvt.intpro
 scrollbar-next.lo:  scrollbar-next.C  $(DEPS) scrollbar-next.intpro
 scrollbar-xterm.lo: scrollbar-xterm.C $(DEPS) scrollbar-xterm.intpro
+scrollbar-plain.lo: scrollbar-plain.C $(DEPS) scrollbar-plain.intpro
 strings.lo:         strings.C   $(DEPS) strings.intpro
 xdefaults.lo:       xdefaults.C $(DEPS) xdefaults.intpro         version.h
 xpm.lo:             xpm.C       $(DEPS) xpm.intpro

diff --git a/src/rxvt.h b/src/rxvt.h
index 202bf3188bacca4fbe0f833806e8045139119299..6d271d927b068536bcdc3564298075757d75e174 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -953,8 +953,7 @@ struct rxvt_term : rxvt_vars {
                   ShadowGC;
 #endif
 #ifdef PLAIN_SCROLLBAR
-  GC              pscrollbarGC,
-                  pShadowGC;
+  GC              pscrollbarGC;
 #endif
 #ifdef NEXT_SCROLLBAR
   GC              blackGC,

diff --git a/src/screen.C b/src/screen.C
index de212c6df23786beec0b4d627104f43d54d329ea..592ec35efeb6ce1641d1a826a567eeb28926d943 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -1714,8 +1714,8 @@ rxvt_term::scr_touch (bool refresh)
 int
 rxvt_term::scr_move_to (int y, int len)
 {
-    long            p = 0;
-    uint16_t       oldviewstart;
+    long p = 0;
+    uint16_t oldviewstart;
 
     oldviewstart = TermWin.view_start;
     if (y < len) {
@@ -2119,18 +2119,6 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
             rend = GET_ATTR (rend);
 
             rvid = !!(rend & RS_RVid);
-#ifdef TEXT_BLINK
-            if (rend & RS_Blink)
-              {
-                if (!text_blink_ev.active)
-                  {
-                    text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
-                    hidden_text = 0;
-                  }
-                else if (hidden_text)
-                  fore = back;
-              }
-#endif
             if (rvid)
               {
                 SWAP_IT(fore, back, int);
@@ -2144,6 +2132,18 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
                   back = Color_RV;
 #endif
               }
+#ifdef TEXT_BLINK
+            if (rend & RS_Blink)
+              {
+                if (!text_blink_ev.active)
+                  {
+                    text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
+                    hidden_text = 0;
+                  }
+                else if (hidden_text)
+                  fore = back;
+              }
+#endif
 #ifndef NO_BOLD_UNDERLINE_REVERSE
             else if (rend & RS_Bold)
               {

diff --git a/src/scrollbar-next.C b/src/scrollbar-next.C
index d112299dd2647c2412d0fa8723ae03a177ef11b0..a68a8d25c1d7739f01cd40116f55dd3e2a186898 100644 (file)
--- a/src/scrollbar-next.C
+++ b/src/scrollbar-next.C
@@ -1,7 +1,6 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:       scrollbar-next.c
  *----------------------------------------------------------------------*
- * $Id: scrollbar-next.C,v 1.5 2004-01-31 00:20:21 pcg Exp $
  *
  * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
  * Copyright (c) 1998      Alfredo K. Kojima <kojima@windowmaker.org>

diff --git a/src/scrollbar-plain.C b/src/scrollbar-plain.C
index e122984527f185dddcf5eb9bbafc986367836e90..f45893f86cf4a8bec3f4e466c12ffdbc2e2d20fe 100644 (file)
--- a/src/scrollbar-plain.C
+++ b/src/scrollbar-plain.C
@@ -43,8 +43,6 @@ rxvt_term::scrollbar_show_plain (int update __attribute__((unused)), int last_to
        pscrollbarGC = XCreateGC(Xdisplay, scrollBar.win,
                                       GCForeground | GCBackground
                                       | GCFillStyle, &gcvalue);
-       gcvalue.foreground = PixColors[Color_border];
-       pShadowGC = XCreateGC(Xdisplay, scrollBar.win, GCForeground, &gcvalue);
     }
 /* instead of XClearWindow (Xdisplay, scrollBar.win); */
     xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
@@ -59,7 +57,7 @@ rxvt_term::scrollbar_show_plain (int update __attribute__((unused)), int last_to
                   sbwidth + 1, (last_bot - scrollBar.bot), False);
 
 /* scrollbar slider */
-    XFillRectangle(Xdisplay, scrollBar.win, xscrollbarGC,
+    XFillRectangle(Xdisplay, scrollBar.win, pscrollbarGC,
                   xsb + 1, scrollBar.top, sbwidth, scrollbar_len);
 
     return 1;

diff --git a/src/scrollbar-rxvt.C b/src/scrollbar-rxvt.C
index 197f2dd49a4e1769d87659df1348f503919ab489..8b2ef63bb8ed564306e5bb637122f674af366305 100644 (file)
--- a/src/scrollbar-rxvt.C
+++ b/src/scrollbar-rxvt.C
@@ -1,7 +1,6 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:       scrollbar-rxvt.c
  *----------------------------------------------------------------------*
- * $Id: scrollbar-rxvt.C,v 1.4 2004-01-31 00:20:21 pcg Exp $
  *
  * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
  * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>

diff --git a/src/scrollbar-xterm.C b/src/scrollbar-xterm.C
index 2e5d590a4c48bb128ae996b20f3d60f24787d81e..90d08a981e91cc1be165c865df1f2be831e68661 100644 (file)
--- a/src/scrollbar-xterm.C
+++ b/src/scrollbar-xterm.C
@@ -1,7 +1,6 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:       scrollbar-xterm.c
  *----------------------------------------------------------------------*
- * $Id: scrollbar-xterm.C,v 1.4 2004-01-31 00:20:21 pcg Exp $
  *
  * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
  * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
@@ -30,7 +29,7 @@
 
 #define x_stp_width    8
 #define x_stp_height   2
-const unsigned char x_stp_bits[] = { 0xff, 0xff };
+const unsigned char x_stp_bits[] = { 0xaa, 0x55 };
 
 int
 rxvt_term::scrollbar_show_xterm (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len)
@@ -54,31 +53,30 @@ rxvt_term::scrollbar_show_xterm (int update __attribute__((unused)), int last_to
        gcvalue.background = PixColors[Color_bg];
 
        xscrollbarGC = XCreateGC(Xdisplay, scrollBar.win,
-                                      GCForeground | GCBackground
-                                      | GCFillStyle | GCStipple, &gcvalue);
+                                GCForeground | GCBackground
+                                | GCFillStyle | GCStipple, &gcvalue);
        gcvalue.foreground = PixColors[Color_border];
-       ShadowGC = XCreateGC(Xdisplay, scrollBar.win, GCForeground,
-                                  &gcvalue);
+       ShadowGC = XCreateGC(Xdisplay, scrollBar.win, GCForeground, &gcvalue);
     }
 /* instead of XClearWindow (Xdisplay, scrollBar.win); */
     xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
     if (last_top < scrollBar.top)
        XClearArea(Xdisplay, scrollBar.win,
                   sb_shadow + xsb, last_top,
-                  sbwidth + 1, (scrollBar.top - last_top), False);
+                  sbwidth, (scrollBar.top - last_top), False);
 
     if (scrollBar.bot < last_bot)
        XClearArea(Xdisplay, scrollBar.win,
                   sb_shadow + xsb, scrollBar.bot,
-                  sbwidth + 1, (last_bot - scrollBar.bot), False);
+                  sbwidth, (last_bot - scrollBar.bot), False);
 
 /* scrollbar slider */
     XFillRectangle(Xdisplay, scrollBar.win, xscrollbarGC,
-                  xsb + 1, scrollBar.top, sbwidth, scrollbar_len);
+                  xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len);
 
-    /*XDrawLine(Xdisplay, scrollBar.win, ShadowGC,
+    XDrawLine(Xdisplay, scrollBar.win, ShadowGC,
              xsb ? 0 : sbwidth, scrollBar.beg,
-             xsb ? 0 : sbwidth, scrollBar.end);*/
+             xsb ? 0 : sbwidth, scrollBar.end);
     return 1;
 }
 #endif                         /* XTERM_SCROLLBAR */

diff --git a/src/scrollbar.C b/src/scrollbar.C
index e7082d22b95d6116284a91bbdf99042a00c7077e..e093a3106219c1eb5f0ded84a39a07a0ec9f9b24 100644 (file)
--- a/src/scrollbar.C
+++ b/src/scrollbar.C
@@ -195,7 +195,7 @@ rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, co
 #  endif
 #  ifdef PLAIN_SCROLLBAR
        if (STRNCASECMP(scrollstyle, "plain", 5) == 0)
-           style = R_SB_XTERM;
+           style = R_SB_PLAIN;
 #  endif
     }
 # endif