From b91c1023e8e9adf9f92806ed759fe7baab89621d Mon Sep 17 00:00:00 2001 From: root Date: Mon, 16 Aug 2004 00:17:27 +0000 Subject: [PATCH] *** empty log message *** --- doc/rxvt.7.pod | 60 ++++++++++++++++++++++++++++++++++++------------ src/rxvtlib.h.in | 28 +++++++++++----------- 2 files changed, 59 insertions(+), 29 deletions(-) diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod index cdf3271d..266ed679 100644 --- a/doc/rxvt.7.pod +++ b/doc/rxvt.7.pod @@ -189,7 +189,7 @@ Where B<< C >> is one of: X -=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 >> I +=item B<< C >> (partially implemented) =begin table B<< C >> Automatic Newline (LNM) - B<< C >> Normal Linefeed (LNM) + B<< C >> Normal Linefeed (LNM) =end table @@ -380,10 +380,13 @@ Character Attributes (SGR) =begin table B<< C >> Normal (default) - B<< C >> On / Off Bold (bright fg) + B<< C >> On / Off Bold (bright fg) + B<< C >> On / Off Italic (NYI) B<< C >> On / Off Underline - B<< C >> On / Off Blink (bright bg) - B<< C >> On / Off Inverse + B<< C >> On / Off Slow Blink (bright bg) + B<< C >> On / Off Rapid Blink (bright bg) + B<< C >> On / Off Invisible (NYI) + B<< C >> On / Off Inverse B<< C >> fg/bg Black B<< C >> fg/bg Red B<< C >> fg/bg Green @@ -393,6 +396,15 @@ Character Attributes (SGR) B<< C >> fg/bg Cyan B<< C >> fg/bg White B<< C >> fg/bg Default + B<< C >> fg/bg Bright Black + B<< C >> fg/bg Bright Red + B<< C >> fg/bg Bright Green + B<< C >> fg/bg Bright Yellow + B<< C >> fg/bg Bright Blue + B<< C >> fg/bg Bright Magenta + B<< C >> fg/bg Bright Cyan + B<< C >> fg/bg Bright White + B<< C >> fg/bg Bright Default =end table @@ -537,14 +549,12 @@ Toggle DEC Private Mode Values (rxvt extension). I =end table -X - =item B<< C >> (B) =begin table - B<< C >> visible - B<< C >> invisible + B<< C >> menuBar visible + B<< C >> menuBar invisible =end table @@ -655,7 +665,7 @@ X =end table -=item B<< C >> +=item B<< C >> (B) =begin table @@ -664,7 +674,7 @@ X =end table -=item B<< C >> +=item B<< C >> (B) =begin table @@ -691,6 +701,15 @@ X =end table +=item B<< C >> + +=begin table + + B<< C >> Use Alternate Screen Buffer - clear Alternate Screen Buffer if switching to it + B<< C >> Use Normal Screen Buffer + +=end table + =back =back @@ -729,7 +748,7 @@ B can be escaped by prefixing it with SYN (0x16, ^V). B<< C >> Log all scrollback buffer and all of screen to B<< C >> B<< C >> Change current locale to B<< C >>, or, if B<< C >> is B<< C >>, return the current locale (@@RXVT_NAME@@ extension) B<< C >> find font for character, used for debugging (@@RXVT_NAME@@ extension) - B<< C >> command B<< C >> I (@@RXVT_NAME@@ extension) + B<< C >> menubar command B<< C >> I (@@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). 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 14e396a7..43320c3a 100644 --- a/src/rxvtlib.h.in +++ b/src/rxvtlib.h.in @@ -24,6 +24,8 @@ #include +#include "ptytty.h" + extern "C" { #include /* 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_ */ -- 2.34.1