-- Leo's gemini proxy
-- Connecting to git.thebackupbox.net:1965...
-- Connected
-- Sending request
-- Meta line: 20 text/gemini
repo: rxvt-unicode-sixel action: commit revision: path_from: revision_from: 42615168f8a92ed03fa169cd813f116d69427221: path_to: revision_to:
commit 42615168f8a92ed03fa169cd813f116d69427221
Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
Date: Tue May 1 09:34:07 2007 +0000
*** empty log message ***
diff --git a/src/rxvtlib.h.in b/src/rxvtlib.h.in
--- a/src/rxvtlib.h.in
+++ b/src/rxvtlib.h.in
@@ -206,8 +206,8 @@ typedef struct {
/* rxvt_vars.options */
enum {
-# define def(name,idx) Opt_ ## name = 1UL << (idx),
-# define nodef(name) Opt_ ## name = 0,
+# define def(name,idx) Opt_ ## name = 1UL << (idx), Opt_ ## name ## _idx = idx,
+# define nodef(name) Opt_ ## name = 0, Opt_ ## name ## _idx = 0,
# include "optinc.h"
# undef nodef
# undef def
diff --git a/src/xdefaults.C b/src/xdefaults.C
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -32,9 +32,8 @@
#endif
/* place holders used for parsing command-line options */
-#define Optflag_Reverse 0x40000000UL
-#define Optflag_Boolean 0x80000000UL
-#define Optflag_mask 0x3fffffffUL
+#define Optflag_Reverse 1
+#define Optflag_Boolean 2
/* monolithic option/resource structure: */
/*
@@ -45,23 +44,23 @@
/* INFO () - descriptive information only */
#define INFO(opt, arg, desc) \
- {0, -1, NULL, (opt), (arg), (desc)}
+ {0, 0, -1, NULL, (opt), (arg), (desc)}
/* STRG () - command-line option, with/without resource */
#define STRG(rsp, kw, opt, arg, desc) \
- {0, (rsp), (kw), (opt), (arg), (desc)}
+ {0, 0, (rsp), (kw), (opt), (arg), (desc)}
/* RSTRG () - resource/long-option */
#define RSTRG(rsp, kw, arg) \
- {0, (rsp), (kw), NULL, (arg), NULL}
+ {0, 0, (rsp), (kw), NULL, (arg), NULL}
/* BOOL () - regular boolean `-/+' flag */
-#define BOOL(rsp, kw, opt, flag, desc) \
- { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
+#define BOOL(rsp, kw, opt, option, flag, desc) \
+ { option ## _idx, (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
/* SWCH () - `-' flag */
-#define SWCH(opt, flag, desc) \
- { (flag), -1, NULL, (opt), NULL, (desc)}
+#define SWCH(opt, option, flag, desc) \
+ { option ## _idx, (flag), -1, NULL, (opt), NULL, (desc)}
/* convenient macros */
#define optList_strlen(i) \
@@ -75,7 +74,8 @@
static const struct
{
- const unsigned long flag; /* Option flag */
+ const uint8_t index; /* Option index */
+ const uint8_t flag; /* Option flag */
const int doff; /* data offset */
const char *kw; /* keyword */
const char *opt; /* option */
@@ -88,28 +88,28 @@ optList[] = {
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"),
- 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_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
- BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
- BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
+ SWCH ("C", Opt_console, 0, "intercept console messages"),
+ SWCH ("iconic", Opt_iconic, 0, "start iconic"),
+ SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
+ BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
+ BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
+ BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
+ BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
#if HAVE_SCROLLBARS
RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
- 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"),
+ BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
+ BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
+ BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
#endif
- BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
- BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_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_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
+ BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
+ BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
+ BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
#if TRANSPARENT
- BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
- SWCH ("tr", Opt_transparent, NULL),
+ BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
+ SWCH ("tr", Opt_transparent, 0, NULL),
# if TINTING
STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
# endif
@@ -121,29 +121,29 @@ optList[] = {
#if TINTING
STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
#endif
- BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
+ BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
#ifndef NO_BELL
- BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
+ BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
- BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL),
+ BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
# endif
#endif
#ifdef META8_OPTION
- BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
+ BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
#endif
#ifdef MOUSE_WHEEL
- BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
+ BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
#endif
#if ENABLE_FRILLS
- BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
- BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
- BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"),
+ BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
+ BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
+ BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
#endif
#if CURSOR_BLINK
- BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
+ BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
#endif
#ifdef POINTER_BLANK
- BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),
+ BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
#endif
STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
@@ -197,7 +197,7 @@ optList[] = {
STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
- BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"),
+ BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
#endif
#ifdef USE_XIM
STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
@@ -218,15 +218,15 @@ optList[] = {
#endif
#if ENABLE_FRILLS
RSTRG (Rs_transient_for, "transient-for", "windowid"),
- BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
+ BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
- BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
+ BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
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"),
- BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
- BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
+ BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
+ BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
#endif
#ifdef POINTER_BLANK
@@ -248,8 +248,8 @@ optList[] = {
#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"),
+ BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
+ BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
#endif
#if ENABLE_PERL
RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
@@ -551,7 +551,7 @@ rxvt_term::get_options (int argc, const char *const *argv)
}
else
{ /* boolean value */
- set_option (optList[entry].flag & Optflag_mask, flag == resval_on);
+ set_option (1UL << optList[entry].index, flag == resval_on);
if (optList[entry].doff != -1)
rs[optList[entry].doff] = flag;
@@ -829,7 +829,7 @@ rxvt_term::extract_resources ()
if (optList_isReverse (entry))
s = !s;
- set_option (optList[entry].flag & Optflag_mask, s);
+ set_option (1UL << optList[entry].index, s);
}
}
}
-----END OF PAGE-----
-- Response ended
-- Page fetched on Sun Jun 2 10:13:09 2024