*** empty log message ***

diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod
index cdf3271db0e5e527493f10c68432f19cf02bd372..266ed679b57f74d4ded1a964551389b55e6b08e3 100644 (file)
--- a/doc/rxvt.7.pod
+++ b/doc/rxvt.7.pod
@@ -189,7 +189,7 @@ Where B<< C<C> >> is one of:
 
 X<CSI>
 
-=head1 CSI (Code Sequence Introducer) Sequences
+=head1 CSI (Command Sequence Introducer) Sequences
 
 =over 4
 
@@ -362,12 +362,12 @@ Reset Mode (RM)
 
 =end table
 
-=item B<< C<Ps = 20> >> I<unimplemented>
+=item B<< C<Ps = 20> >> (partially implemented)
 
 =begin table
 
        B<< C<h> >>     Automatic Newline (LNM)
-       B<< C<h> >>     Normal Linefeed (LNM)
+       B<< C<l> >>     Normal Linefeed (LNM)
 
 =end table
 
@@ -380,10 +380,13 @@ Character Attributes (SGR)
 =begin table
 
        B<< C<Ps = 0> >>        Normal (default)
-       B<< C<Ps = 1 / 22> >>   On / Off Bold (bright fg)
+       B<< C<Ps = 1 / 21> >>   On / Off Bold (bright fg)
+       B<< C<Ps = 3 / 23> >>   On / Off Italic (NYI)
        B<< C<Ps = 4 / 24> >>   On / Off Underline
-       B<< C<Ps = 5 / 25> >>   On / Off Blink (bright bg)
-       B<< C<Ps = 7 / 27> >>   On / Off Inverse
+       B<< C<Ps = 5 / 25> >>   On / Off Slow Blink (bright bg)
+       B<< C<Ps = 6 / 26> >>   On / Off Rapid Blink (bright bg)
+       B<< C<Ps = 7 / 27> >>   On / Off Invisible (NYI)
+       B<< C<Ps = 8 / 27> >>   On / Off Inverse
        B<< C<Ps = 30 / 40> >>  fg/bg Black
        B<< C<Ps = 31 / 41> >>  fg/bg Red
        B<< C<Ps = 32 / 42> >>  fg/bg Green
@@ -393,6 +396,15 @@ Character Attributes (SGR)
        B<< C<Ps = 36 / 46> >>  fg/bg Cyan
        B<< C<Ps = 37 / 47> >>  fg/bg White
        B<< C<Ps = 39 / 49> >>  fg/bg Default
+       B<< C<Ps = 90 / 100> >> fg/bg Bright Black
+       B<< C<Ps = 91 / 101> >> fg/bg Bright Red
+       B<< C<Ps = 92 / 102> >> fg/bg Bright Green
+       B<< C<Ps = 93 / 103> >> fg/bg Bright Yellow
+       B<< C<Ps = 94 / 104> >> fg/bg Bright Blue
+       B<< C<Ps = 95 / 105> >> fg/bg Bright Magenta
+       B<< C<Ps = 96 / 106> >> fg/bg Bright Cyan
+       B<< C<Ps = 97 / 107> >> fg/bg Bright White
+       B<< C<Ps = 99 / 109> >> fg/bg Bright Default
 
 =end table
 
@@ -537,14 +549,12 @@ Toggle DEC Private Mode Values (rxvt extension). I<where>
 
 =end table
 
-X<Priv10>
-
 =item B<< C<Ps = 10> >> (B<rxvt>)
 
 =begin table
 
-       B<< C<h> >>     visible
-       B<< C<l> >>     invisible
+       B<< C<h> >>     menuBar visible
+       B<< C<l> >>     menuBar invisible
 
 =end table
 
@@ -655,7 +665,7 @@ X<Priv66>
 
 =end table
 
-=item B<< C<Ps = 1010> >>
+=item B<< C<Ps = 1010> >> (B<rxvt>)
 
 =begin table
 
@@ -664,7 +674,7 @@ X<Priv66>
 
 =end table
 
-=item B<< C<Ps = 1011> >>
+=item B<< C<Ps = 1011> >> (B<rxvt>)
 
 =begin table
 
@@ -691,6 +701,15 @@ X<Priv66>
 
 =end table
 
+=item B<< C<Ps = 1049> >>
+
+=begin table
+
+       B<< C<h> >>     Use Alternate Screen Buffer - clear Alternate Screen Buffer if switching to it
+       B<< C<l> >>     Use Normal Screen Buffer
+
+=end table
+
 =back
 
 =back
@@ -729,7 +748,7 @@ B<octet> can be escaped by prefixing it with SYN (0x16, ^V).
        B<< C<Ps = 55> >>       Log all scrollback buffer and all of screen to B<< C<Pt> >>
        B<< C<Ps = 701> >>      Change current locale to B<< C<Pt> >>, or, if B<< C<Pt> >> is B<< C<?> >>, return the current locale (@@RXVT_NAME@@ extension)
        B<< C<Ps = 702> >>      find font for character, used for debugging (@@RXVT_NAME@@ extension)
-       B<< C<Ps = 703> >>      command B<< C<Pt> >> I<rxvt compile-time option> (@@RXVT_NAME@@ extension)
+       B<< C<Ps = 703> >>      menubar command B<< C<Pt> >> I<rxvt compile-time option> (@@RXVT_NAME@@ extension)
 
 =end table
 
@@ -1418,11 +1437,15 @@ don't pay for them.
 
 =item --with-codesets=NAME,...
 
-Compile in support for additional codeset groups:
+Compile in support for additional codeset (encoding) groups. These codeset
+tables are currently only used for driving X11 core fonts, they are not
+required for Xft fonts. Compiling them in will make your binary bigger
+(together about 700kB), but it doesn't increase memory usage unless you
+use an X11 font requiring one of these encodings.
 
 =begin table
 
-       all     all of the above
+       all     all available codeset groups
        cn      common chinese encodings
        cn_ext  rarely used but very big chinese encodigs
        jp      common japanese encodings
@@ -1588,6 +1611,13 @@ Add support for many small features that are not essential but nice to
 have. Normally you want this, but for very small binaries you may want to
 disable this.
 
+=item --enable-iso14755
+
+Enable extended ISO 14755 support (see @@RXVT_NAME@@(1), or
+F<doc/rxvt.1.txt>). Basic support (section 5.1) is enabled by
+C<--enable-frills>, while support for 5.2, 5.3 and 5.4 is enabled with
+this switch.
+
 =item --enable-linespace
 
 Add support to provide user specified line spacing between text rows.

diff --git a/src/rxvtlib.h.in b/src/rxvtlib.h.in
index 14e396a76c6cde88964f95bacabc27c25a0ff1cf..43320c3ad4afd12b15c08d373737b3e53b5f49f8 100644 (file)
--- a/src/rxvtlib.h.in
+++ b/src/rxvtlib.h.in
@@ -24,6 +24,8 @@
 
 #include <cwchar>
 
+#include "ptytty.h"
+
 extern "C" {
 #include <X11/Intrinsic.h>      /* Xlib, Xutil, Xresource, Xfuncproto */
 }
@@ -182,7 +184,7 @@ typedef struct {
 #define Screen_WrapNext         (1<<4)  /* need to wrap for next char?       */
 #define Screen_DefaultFlags     (Screen_VisibleCursor|Screen_Autowrap)
 
-/* rxvt_vars.Options */
+/* rxvt_vars.options */
 #define Opt_console             (1UL<<0)
 #define Opt_loginShell          (1UL<<1)
 #define Opt_iconic              (1UL<<2)
@@ -207,12 +209,12 @@ typedef struct {
 #define Opt_cursorBlink         (1UL<<21)
 #define Opt_secondaryScreen    (1UL<<22)
 #define Opt_secondaryScroll    (1UL<<23)
-#ifdef NO_FRILLS
-# define Opt_insecure          0
-# define Opt_borderLess                0
-#else
+#if ENABLE_FRILLS
 # define Opt_insecure          (1UL<<24) // insecure esc sequences
 # define Opt_borderLess                (1UL<<25) // mem borderless hints
+#else
+# define Opt_insecure          0
+# define Opt_borderLess                0
 #endif
 /* place holder used for parsing command-line options */
 #define Opt_Reverse             (1UL<<30)
@@ -251,19 +253,18 @@ struct rxvt_vars {
   TermWin_t       TermWin;
   scrollBar_t     scrollBar;
   menuBar_t       menuBar;
-  unsigned long   Options;
+  unsigned long   options;
   XSizeHints      szHint;
   rxvt_display   *display;
-  rxvt_color     *PixColors;
-  rxvt_color     *PixColorsFocused;
+  rxvt_color     *pix_colors;
+  rxvt_color     *pix_colors_focused;
 #ifdef OFF_FOCUS_FADING
-  rxvt_color     *PixColorsUnFocused;
+  rxvt_color     *pix_colors_unfocused;
 #endif
-  short           numPixColors;
+  short           numpix_colors;
   Cursor          TermWin_cursor;       /* cursor for vt window */
   int             sb_shadow;    /* scrollbar shadow width                    */
-  int             cmd_fd;       /* pty file descriptor; connected to command */
-  int             tty_fd;       /* tty file descriptor; connected to child   */
+  rxvt_ptytty     pty;
   int             numlock_state;
   text_t        **drawn_text;   /* text drawn on screen (characters)         */
   rend_t        **drawn_rend;   /* text drawn on screen (rendition)          */
@@ -275,8 +276,7 @@ struct rxvt_vars {
   selection_t     selection;
 };
 
-void rxvt_init_signals ();
-rxvt_t rxvt_init (int argc, const char *const *argv);
+void rxvt_init ();
 
 #endif                          /* _RXVTLIB_H_ */