--enable-lastlog enable lastlog support (requires --enable-utmp)
--enable-xpm-background enable XPM background pixmaps
--enable-transparency enable transparent backgrounds
+ --enable-tinting enable tinting of transparent bg
--enable-menubar enable menubar
--enable-rxvt-scroll enable rxvt style scrollbar
--enable-next-scroll enable NeXT style scrollbar
case "$host" in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5035 "configure"' > conftest.$ac_ext
+ echo '#line 5036 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
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:5587: \"$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
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7202 "configure"
+#line 7203 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7300 "configure"
+#line 7301 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
support_frills=no
support_linespace=no
support_inheritpixmap=no
+support_tinting=no
support_keepscrolling=no
support_selectionscrolling=no
support_menubar=no
support_frills=yes
support_linespace=yes
support_inheritpixmap=yes
+ support_tinting=yes
support_keepscrolling=yes
support_selectionscrolling=yes
support_lastlog=yes
fi
fi;
+# Check whether --enable-tinting or --disable-tinting was given.
+if test "${enable_tinting+set}" = set; then
+ enableval="$enable_tinting"
+ if test x$enableval = xyes -o x$enableval = xno; then
+ support_tinting=$enableval
+ fi
+fi;
+
# Check whether --enable-menubar or --disable-menubar was given.
if test "${enable_menubar+set}" = set; then
enableval="$enable_menubar"
-echo "$as_me:$LINENO: checking for X" >&5
+
+if test "x$ac_path_x_has_been_run" != xyes; then
+ echo "$as_me:$LINENO: checking for X" >&5
echo $ECHO_N "checking for X... $ECHO_C" >&6
+ac_path_x_has_been_run=yes
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Intrinsic.h.
+ # Guess where to find include files, by looking for a specified header file.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
# Update the cache value to reflect the command line values.
ac_cv_have_x="have_x=yes \
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ # It might be that x_includes is empty (headers are found in the
+ # standard search path. Then output the corresponding message
+ ac_out_x_includes=$x_includes
+ test "x$x_includes" = x && ac_out_x_includes="in standard search path"
+ echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
fi
+fi
if test "$no_x" = yes; then
# Not all programs may use this symbol, but it does not hurt to define it.
fi
+if test x$support_tinting = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define TINTING 1
+_ACEOF
+
+fi
if test x$support_inheritpixmap = xyes; then
cat >>confdefs.h <<\_ACEOF
.if !\n(.g .ab GNU tbl requires GNU troff.
.if !dTS .ds TS
.if !dTE .ds TE
-.TH "RXVT" "1" "2004-03-28" "X Version 11" "X Tools"
+.TH "RXVT" "1" "2004-04-02" "X Version 11" "X Tools"
.SH "NAME"
rxvt-unicode (ouR XVT, unicode) \- a VT102 emulator for the X window system
.PP
\fBalt\fP, \fBmeta\fP, \fBhyper\fP, \fBsuper\fP, \fBmod1\fP, \fBmod2\fP, \fBmod3\fP,
\fBmod4\fP, \fBmod5\fP;
resource \fImodifier\fP\&.
+.IP "\fB-ssc\fP|\fB+ssc\fP"
+Turn on/off secondary screen (default enabled);
+resource \fBsecondaryScreen\fP\&.
+.IP "\fB-ssr\fP|\fB+ssr\fP"
+Turn on/off secondary screen scroll (default enabled);
+resource \fBsecondaryScroll\fP\&.
.IP "\fB-xrm\fP \fIresourcestring\fP"
No effect on rxvt\&. Simply passes through an argument to be made
available in the instance\&'s argument list\&. Appears in \fIWM_COMMAND\fP
.IP "\fBinsecure\fP"
Enables "insecure" mode\&. Rxvt-unicode offers some escape sequences
that echo arbitrary strings like the icon name or the locale\&. This
-could be abused if somebody gets 8-bit-clean access to your display,
-wether throuh a mail client displaying mail bodies unfiltered or
-though write(1)\&. Therefore, these sequences are disabled by default\&.
-You can enable them by setting this boolean resource or specifying
-\fB-insecure\fP as an option\&. At the moment, this enabled display-answer,
-locale, findfont, icon label and window title requests as well as
-dynamic menubar dispatch\&.
+could be abused if somebody gets 8-bit-clean access to your
+display, wether throuh a mail client displaying mail bodies
+unfiltered or though write(1)\&. Therefore, these sequences are
+disabled by default\&. (Note that other terminals, including xterm,
+have these sequences enabled by default)\&. You can enable them
+by setting this boolean resource or specifying \fB-insecure\fP as
+an option\&. At the moment, this enabled display-answer, locale,
+findfont, icon label and window title requests as well as dynamic
+menubar dispatch\&.
.IP "\fBmodifier:\fP \fImodifier\fP"
Set the key to be interpreted as the Meta key to:
\fBalt\fP, \fBmeta\fP, \fBhyper\fP, \fBsuper\fP, \fBmod1\fP, \fBmod2\fP, \fBmod3\fP,
Specify the reply rxvt sends to the shell when an ENQ (control-E)
character is passed through\&. It may contain escape values as
described in the entry on \fBkeysym\fP following\&.
+.IP "\fBsecondaryScreen:\fP \fIbool\fP"
+Turn on/off secondary screen (default enabled)\&.
+.IP "\fBsecondaryScroll:\fP \fIbool\fP"
+Turn on/off secondary screen scroll (default enabled)\&. If
+the this option is enabled, scrolls on the secondary screen will
+change the scrollback buffer and switching to/from the secondary screen
+will instead scroll the screen up\&.
.IP "\fBkeysym\&.\fP\fIsym\fP: \fIstring\fP"
Associate \fIstring\fP with keysym \fIsym\fP (\fB0xFF00 - 0xFFFF\fP)\&. It
may contain escape values (\ea: bell, \eb: backspace, \ee, \eE: escape,
-.TH "RXVT" "1" "2004-03-28" "X Version 11" "X Tools"
+.TH "RXVT" "1" "2004-04-02" "X Version 11" "X Tools"
.SH "NAME"
rxvt-unicode (ouR XVT, unicode) \- a VT102 emulator for the X window system
.PP
\fBalt\fP, \fBmeta\fP, \fBhyper\fP, \fBsuper\fP, \fBmod1\fP, \fBmod2\fP, \fBmod3\fP,
\fBmod4\fP, \fBmod5\fP;
resource \fImodifier\fP\&.
+.IP "\fB-ssc\fP|\fB+ssc\fP"
+Turn on/off secondary screen (default enabled);
+resource \fBsecondaryScreen\fP\&.
+.IP "\fB-ssr\fP|\fB+ssr\fP"
+Turn on/off secondary screen scroll (default enabled);
+resource \fBsecondaryScroll\fP\&.
.IP "\fB-xrm\fP \fIresourcestring\fP"
No effect on rxvt\&. Simply passes through an argument to be made
available in the instance\&'s argument list\&. Appears in \fIWM_COMMAND\fP
.IP "\fBinsecure\fP"
Enables "insecure" mode\&. Rxvt-unicode offers some escape sequences
that echo arbitrary strings like the icon name or the locale\&. This
-could be abused if somebody gets 8-bit-clean access to your display,
-wether throuh a mail client displaying mail bodies unfiltered or
-though write(1)\&. Therefore, these sequences are disabled by default\&.
-You can enable them by setting this boolean resource or specifying
-\fB-insecure\fP as an option\&. At the moment, this enabled display-answer,
-locale, findfont, icon label and window title requests as well as
-dynamic menubar dispatch\&.
+could be abused if somebody gets 8-bit-clean access to your
+display, wether throuh a mail client displaying mail bodies
+unfiltered or though write(1)\&. Therefore, these sequences are
+disabled by default\&. (Note that other terminals, including xterm,
+have these sequences enabled by default)\&. You can enable them
+by setting this boolean resource or specifying \fB-insecure\fP as
+an option\&. At the moment, this enabled display-answer, locale,
+findfont, icon label and window title requests as well as dynamic
+menubar dispatch\&.
.IP "\fBmodifier:\fP \fImodifier\fP"
Set the key to be interpreted as the Meta key to:
\fBalt\fP, \fBmeta\fP, \fBhyper\fP, \fBsuper\fP, \fBmod1\fP, \fBmod2\fP, \fBmod3\fP,
Specify the reply rxvt sends to the shell when an ENQ (control-E)
character is passed through\&. It may contain escape values as
described in the entry on \fBkeysym\fP following\&.
+.IP "\fBsecondaryScreen:\fP \fIbool\fP"
+Turn on/off secondary screen (default enabled)\&.
+.IP "\fBsecondaryScroll:\fP \fIbool\fP"
+Turn on/off secondary screen scroll (default enabled)\&. If
+the this option is enabled, scrolls on the secondary screen will
+change the scrollback buffer and switching to/from the secondary screen
+will instead scroll the screen up\&.
.IP "\fBkeysym\&.\fP\fIsym\fP: \fIstring\fP"
Associate \fIstring\fP with keysym \fIsym\fP (\fB0xFF00 - 0xFFFF\fP)\&. It
may contain escape values (\ea: bell, \eb: backspace, \ee, \eE: escape,
-COMMENT(-- $Id: rxvt-options.yo,v 1.9 2004-03-29 21:02:11 pcg Exp $ --)
+COMMENT(-- $Id: rxvt-options.yo,v 1.10 2004-04-02 18:00:00 pcg Exp $ --)
COMMENT(----------------------------------------------------------------------)
manpageoptions()
bf(alt), bf(meta), bf(hyper), bf(super), bf(mod1), bf(mod2), bf(mod3),
bf(mod4), bf(mod5);
resource em(modifier).
+ dit(bf(-ssc)|bf(+ssc))
+ Turn on/off secondary screen (default enabled);
+ resource bf(secondaryScreen).
+ dit(bf(-ssr)|bf(+ssr))
+ Turn on/off secondary screen scroll (default enabled);
+ resource bf(secondaryScroll).
dit(bf(-xrm) em(resourcestring))
No effect on rxvt. Simply passes through an argument to be made
available in the instance's argument list. Appears in em(WM_COMMAND)
-COMMENT(-- $Id: rxvt-resources.yo,v 1.10 2004-04-02 00:51:09 pcg Exp $ --)
+COMMENT(-- $Id: rxvt-resources.yo,v 1.11 2004-04-02 18:00:00 pcg Exp $ --)
COMMENT(----------------------------------------------------------------------)
manpagesection(RESOURCES (available also as long-options))
Specify the reply rxvt sends to the shell when an ENQ (control-E)
character is passed through. It may contain escape values as
described in the entry on bf(keysym) following.
+ dit(bf(secondaryScreen:) em(bool))
+ Turn on/off secondary screen (default enabled).
+ dit(bf(secondaryScroll:) em(bool))
+ Turn on/off secondary screen scroll (default enabled). If
+ the this option is enabled, scrolls on the secondary screen will
+ change the scrollback buffer and switching to/from the secondary screen
+ will instead scroll the screen up.
dit(bf(keysym.)em(sym): em(string))
Associate em(string) with keysym em(sym) (bf(0xFF00 - 0xFFFF)). It
may contain escape values (\a: bell, \b: backspace, \e, \E: escape,
/* #define DISPLAY_IS_IP */
/*
- * Have "\E[7n" transmit the display name.
- * This has been cited as a potential security hole.
- */
-#define ENABLE_DISPLAY_ANSWER
-
-/*
* Change what ESC Z transmits instead of the default "\E[?1;2c"
*/
/* #define ESCZ_ANSWER "\033[?1;2C" */
/* #define NO_SECONDARY_SCREEN_CURSOR */
/*
- * If no secondary screen is available (NO_SECONDARY_SCREEN in config.h),
- * then scroll the text up on a window change request
- */
-#define SCROLL_ON_NO_SECONDARY
-
-/*
* Width of the term internal border
*/
#define INTERNALBORDERWIDTH 2
*/
/* #define TERMCAP_HAS_BW */
+/*
+ * Some (older, e.g. fvwm 2.2.2) window managers need some time when
+ * updating window positions. If transparency isn't working correctly
+ * then you might try out this one.
+ */
+/* #define WAIT_FOR_WM */
+
#endif
*/
typedef struct {
- uint16_t width; /* window width [pixels] */
+ uint16_t width; /* window width [pixels] */
uint16_t height; /* window height [pixels] */
uint16_t fwidth; /* font width [pixels] */
uint16_t fheight; /* font height [pixels] */
- uint16_t fbase; /* font ascent (baseline) [pixels] */
+ uint16_t fbase; /* font ascent (baseline) [pixels] */
uint16_t propfont; /* font proportional flags */
- uint16_t ncol; /* window columns [characters] */
- uint16_t nrow; /* window rows [characters] */
- uint16_t focus; /* window has focus */
+ uint16_t ncol; /* window columns [characters] */
+ uint16_t nrow; /* window rows [characters] */
+ uint16_t focus; /* window has focus */
uint16_t mapped; /* window state mapped? */
- uint16_t int_bwidth; /* internal border width */
- uint16_t ext_bwidth; /* external border width */
+ uint16_t int_bwidth; /* internal border width */
+ uint16_t ext_bwidth; /* external border width */
uint16_t lineSpace; /* number of extra pixels between rows */
uint16_t saveLines; /* number of lines that fit in scrollback */
uint16_t nscrolled; /* number of line actually scrolled */
#define Screen_DefaultFlags (Screen_VisibleCursor|Screen_Autowrap)
/* rxvt_vars.Options */
-#define Opt_console (1LU<<0)
-#define Opt_loginShell (1LU<<1)
-#define Opt_iconic (1LU<<2)
-#define Opt_visualBell (1LU<<3)
-#define Opt_mapAlert (1LU<<4)
-#define Opt_reverseVideo (1LU<<5)
-#define Opt_utmpInhibit (1LU<<6)
-#define Opt_scrollBar (1LU<<7)
-#define Opt_scrollBar_right (1LU<<8)
-#define Opt_scrollBar_floating (1LU<<9)
-#define Opt_meta8 (1LU<<10)
-#define Opt_scrollTtyOutput (1LU<<11)
-#define Opt_scrollTtyKeypress (1LU<<12)
-#define Opt_transparent (1LU<<13)
-#define Opt_transparent_all (1LU<<14)
-#define Opt_15 (1LU<<15) // UNALLOCATED
-#define Opt_tripleclickwords (1LU<<16)
-#define Opt_scrollWithBuffer (1LU<<17)
-#define Opt_jumpScroll (1LU<<18)
-#define Opt_mouseWheelScrollPage (1LU<<19)
-#define Opt_pointerBlank (1LU<<20)
-#define Opt_cursorBlink (1LU<<21)
+#define Opt_console (1UL<<0)
+#define Opt_loginShell (1UL<<1)
+#define Opt_iconic (1UL<<2)
+#define Opt_visualBell (1UL<<3)
+#define Opt_mapAlert (1UL<<4)
+#define Opt_reverseVideo (1UL<<5)
+#define Opt_utmpInhibit (1UL<<6)
+#define Opt_scrollBar (1UL<<7)
+#define Opt_scrollBar_right (1UL<<8)
+#define Opt_scrollBar_floating (1UL<<9)
+#define Opt_meta8 (1UL<<10)
+#define Opt_scrollTtyOutput (1UL<<11)
+#define Opt_scrollTtyKeypress (1UL<<12)
+#define Opt_transparent (1UL<<13)
+#define Opt_transparent_all (1UL<<14)
+#define Opt_15 (1UL<<15) // UNALLOCATED
+#define Opt_tripleclickwords (1UL<<16)
+#define Opt_scrollWithBuffer (1UL<<17)
+#define Opt_jumpScroll (1UL<<18)
+#define Opt_mouseWheelScrollPage (1UL<<19)
+#define Opt_pointerBlank (1UL<<20)
+#define Opt_cursorBlink (1UL<<21)
+#ifdef NO_FRILLS
+# define Opt_insecure 0
+#else
+# define Opt_insecure (1UL<<22) // insecure esc sequences
+#endif
+#define Opt_secondaryScreen (1UL<<23)
+#define Opt_secondaryScroll (1UL<<24)
/* place holder used for parsing command-line options */
-#define Opt_Reverse (1LU<<30)
-#define Opt_Boolean (1LU<<31)
+#define Opt_Reverse (1UL<<30)
+#define Opt_Boolean (1UL<<31)
-#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
- | Opt_jumpScroll)
+#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput | \
+ Opt_jumpScroll | Opt_secondaryScreen)
/* ------------------------------------------------------------------------- */
/*--------------------------------*-C-*---------------------------------*
* File: xdefaults.c
*----------------------------------------------------------------------*
- * $Id: xdefaults.C,v 1.19 2004-03-22 15:15:04 pcg Exp $
+ * $Id: xdefaults.C,v 1.23 2004-04-02 18:00:01 pcg Exp $
*
* All portions of code are copyright by their respective author/s.
* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
optList[] = {
STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
- STRG (Rs_term_name, "termName", "tn", "string",
- "value of the TERM environment variable"),
+ STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
- STRG (Rs_geometry, "geometry", "geometry", "geometry",
- "size (in characters) and position"),
+ STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
SWCH ("C", Opt_console, "intercept console messages"),
SWCH ("iconic", Opt_iconic, "start iconic"),
SWCH ("ic", Opt_iconic, NULL), /* short form */
- BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo,
- "reverse video"),
+ BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
#ifdef HAVE_SCROLLBARS
BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
- BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right,
- "scrollbar right"),
- BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st",
- Opt_scrollBar_floating, "scrollbar without a trough"),
-#endif
- BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput,
- NULL),
- BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput,
- "scroll-on-tty-output inhibit"),
- BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress,
- "scroll-on-keypress"),
- BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer,
- "scroll-with-buffer"),
+ BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
+ BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
+#endif
+ BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
+ BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
+ BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
+ BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
#ifdef TRANSPARENT
- BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent,
- "inherit parent pixmap"),
- BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all,
- "forcefully inherit root pixmap"),
+ BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
+ BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
SWCH ("tr", Opt_transparent, NULL),
+#if TINTING
+ STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
+#endif
#endif
BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
#ifndef NO_BELL
BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
#endif
#ifdef MOUSE_WHEEL
- BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage,
- NULL),
+ BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
#endif
#ifndef NO_FRILLS
- BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords,
- "triple click word selection"),
+ BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
+ BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
#endif
#ifdef CURSOR_BLINK
BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
RSTRG (Rs_path, "path", "search path"),
#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
#ifdef XPM_BACKGROUND
- STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]",
- "background pixmap"),
+ STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
#endif /* XPM_BACKGROUND */
#if (MENUBAR_MAX)
RSTRG (Rs_menu, "menu", "name[;tag]"),
/* fonts: command-line option = resource name */
#ifdef USE_XIM
STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
- STRG (Rs_preeditType, "preeditType", "pt", "style",
- "input style: style = OverTheSpot|OffTheSpot|Root"),
+ STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
#endif
#endif /* USE_XIM */
- STRG (Rs_name, NULL, "name", "string",
- "client instance, icon, and title strings"),
+ STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
STRG (Rs_title, "title", "title", "string", "title name for window"),
STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
/* command-line option = resource name */
RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
#endif /* NO_CURSORCOLOR */
- STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color",
- "pointer color"),
- STRG (Rs_color + Color_border, "borderColor", "bd", "color",
- "border color"),
- STRG (Rs_saveLines, "saveLines", "sl", "number",
- "number of scrolled lines to save"),
+ STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
+ STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
+ STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
+ STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
#ifndef NO_FRILLS
- STRG (Rs_ext_bwidth, "externalBorder", "w", "number",
- "external border in pixels"),
+ STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
- STRG (Rs_int_bwidth, "internalBorder", "b", "number",
- "internal border in pixels"),
+ STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
#endif
#ifndef NO_LINESPACE
- STRG (Rs_lineSpace, "lineSpace", "lsp", "number",
- "number of extra pixels between rows"),
+ STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
#endif
- STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number",
- "scrollbar thickness/width in pixels"),
+ STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
#ifdef POINTER_BLANK
RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
#endif
#ifdef PRINTPIPE
RSTRG (Rs_print_pipe, "print-pipe", "string"),
#endif
- STRG (Rs_modifier, "modifier", "mod", "modifier",
- "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
+ STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
INFO ("xrm", "string", "X resource"),
#ifdef CUTCHAR_RESOURCE
RSTRG (Rs_cutchars, "cutchars", "string"),
#endif /* CUTCHAR_RESOURCE */
RSTRG (Rs_answerbackstring, "answerbackString", "string"),
+#ifndef NO_SECONDARY_SCREEN
+ BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
+ BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
+#endif
INFO ("e", "command arg ...", "command to execute")
};