"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/xdefaults.C" between
rxvt-unicode-9.26.tar.bz2 and rxvt-unicode-9.29.tar.bz2

About: rxvt-unicode is a clone of the terminal emulator rxvt.

xdefaults.C  (rxvt-unicode-9.26.tar.bz2):xdefaults.C  (rxvt-unicode-9.29.tar.bz2)
skipping to change at line 139 skipping to change at line 139
BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL), BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
# endif # endif
#endif #endif
#ifdef META8_OPTION #ifdef META8_OPTION
BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL), BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
#endif #endif
#ifdef MOUSE_WHEEL #ifdef MOUSE_WHEEL
BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_m ouseWheelScrollPage, 0, NULL), BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_m ouseWheelScrollPage, 0, NULL),
#endif #endif
#if ENABLE_FRILLS #if ENABLE_FRILLS
BOOL (Rs_disablePasteBrackets, "disablePasteBrackets", "dpb", Opt_ disablePasteBrackets, 0, "paste bracket suppression"),
BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_triplecl ickwords, 0, "triple click word selection"), BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_triplecl ickwords, 0, "triple click word selection"),
BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enabl e possibly insecure escape sequences"), BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enabl e possibly insecure escape sequences"),
BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnder line, 0, "underline cursor"), BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnder line, 0, "underline cursor"),
#endif #endif
#if CURSOR_BLINK #if CURSOR_BLINK
BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "bl inking cursor"), BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "bl inking cursor"),
#endif #endif
#ifdef POINTER_BLANK #ifdef POINTER_BLANK
BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"), BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
#endif #endif
skipping to change at line 227 skipping to change at line 228
#if ENABLE_XEMBED #if ENABLE_XEMBED
STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed ter minal in"), STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed ter minal in"),
#endif #endif
#if XFT #if XFT
BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
#endif #endif
#if ENABLE_FRILLS #if ENABLE_FRILLS
STRG (Rs_depth, "depth", "depth", "number", "depth of visual to re quest"), STRG (Rs_depth, "depth", "depth", "number", "depth of visual to re quest"),
STRG (Rs_visual, "visual", "visual", "number", "visual id to reque st"), STRG (Rs_visual, "visual", "visual", "number", "visual id to reque st"),
RSTRG (Rs_transient_for, "transient-for", "windowid"), RSTRG (Rs_transient_for, "transient-for", "windowid"),
BOOL (Rs_override_redirect, "override-redirect", "override-redirec t", Opt_override_redirect, 0, "set override-redirect on the terminal window"), BOOL (Rs_override_redirect, "override-redirect", "override-redirec t", Opt_override_redirect, 0, "override-redirect on the terminal window"),
STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after s hell exit"), BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after s hell exit"),
STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external bo rder in pixels"), STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external bo rder in pixels"),
STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal bo rder in pixels"), STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal bo rder in pixels"),
BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borde rless window"), BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borde rless window"),
STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter sp acing adjustment"), STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter sp acing adjustment"),
#endif #endif
#ifdef BUILTIN_GLYPHS #ifdef BUILTIN_GLYPHS
BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBu iltinGlyphs, 0, "do not use internal glyphs"), BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBu iltinGlyphs, 0, "use of font glyphs instead of internal glyphs"),
#endif #endif
#ifdef POINTER_BLANK #ifdef POINTER_BLANK
RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
#endif #endif
#ifndef NO_BACKSPACE_KEY #ifndef NO_BACKSPACE_KEY
RSTRG (Rs_backspace_key, "backspacekey", "string"), RSTRG (Rs_backspace_key, "backspacekey", "string"),
#endif #endif
#ifndef NO_DELETE_KEY #ifndef NO_DELETE_KEY
RSTRG (Rs_delete_key, "deletekey", "string"), RSTRG (Rs_delete_key, "deletekey", "string"),
#endif #endif
#ifdef PRINTPIPE #ifdef PRINTPIPE
RSTRG (Rs_print_pipe, "print-pipe", "string"), RSTRG (Rs_print_pipe, "print-pipe", "string"),
#endif #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"),
RSTRG (Rs_cutchars, "cutchars", "string"), RSTRG (Rs_cutchars, "cutchars", "string"),
RSTRG (Rs_answerbackstring, "answerbackString", "string"), RSTRG (Rs_answerbackstring, "answerbackString", "string"),
#ifndef NO_SECONDARY_SCREEN #ifndef NO_SECONDARY_SCREEN
BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryS BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryS
creen, 0, "enable secondary screen"), creen, 0, "secondary screen"),
BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryS BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryS
croll, 0, "enable secondary screen scroll"), croll, 0, "secondary screen scroll"),
#endif
#if ENABLE_FRILLS
STRG (Rs_rewrapMode, "rewrapMode", "rm", "string", "rewrap mode (a
uto, always, never)"),
#endif #endif
#if ENABLE_PERL #if ENABLE_PERL
RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated di rectories with extension scripts"),TODO RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated di rectories with extension scripts"),TODO
RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-sep arated list of perl extensions to enable"),TODO RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-sep arated list of perl extensions to enable"),TODO
STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
#endif #endif
#if ISO_14755 #if ISO_14755
BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NUL L), BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NUL L),
skipping to change at line 848 skipping to change at line 852
XrmQuarkList quarks, XrmQuarkList quarks,
XrmRepresentation *type ecb_unused, XrmRepresentation *type ecb_unused,
XrmValue *value, XrmValue *value,
XPointer closure XPointer closure
) )
{ {
const rxvt_enumerate_closure *data = (const rxvt_enumerate_closure *)closure; const rxvt_enumerate_closure *data = (const rxvt_enumerate_closure *)closure;
if (*quarks == NULLQUARK) return False; if (*quarks == NULLQUARK) return False;
// if the quark list starts with a tighly bound quark, we skip it, // if the quark list starts with a tightly bound quark, we skip it,
// as it is the exactly matched the prefix. Otherwise, it matched because // as it exactly matched the prefix. Otherwise, it matched because
// it started with "*", in which case we assuime the prefix is part // it started with "*", in which case we assume the prefix is part
// of the "*". // of the "*".
if (*bindings == XrmBindTightly) if (*bindings == XrmBindTightly)
{ {
++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-m atch ++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-m atch
if (*quarks == NULLQUARK) return False; if (*quarks == NULLQUARK) return False;
} }
// specific, a bit misleadingly named, is used when a specific "subclass" // specific, a bit misleadingly named, is used when a specific "subclass"
// is iterated over, e.g. "keysym", and is used to skip one more // is iterated over, e.g. "keysym", and is used to skip one more
// component, as well as all generic prefixes // component, as well as all generic prefixes
// this is a bit of a hack, ideally, keysym (the only user) should use its // this is a bit of a hack, ideally, keysym (the only user) should use its
// own iteration function, but this ought to be less bloated // own iteration function, but this ought to be less bloated
if (data->specific) if (data->specific)
{ {
if (*bindings != XrmBindTightly) ++quarks, ++bindings;
return False;
++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-m
atch
if (*quarks == NULLQUARK) return False; if (*quarks == NULLQUARK) return False;
} }
char *pattern; char *pattern;
if (quarks[1] == NULLQUARK) if (quarks[1] == NULLQUARK)
pattern = XrmQuarkToString (quarks[0]); // single component, fats path pattern = XrmQuarkToString (quarks[0]); // single component, fast path
else else
{ {
// multiple components, slow path - should be rare, to don't optimize for speed // multiple components, slow path - should be rare, don't optimize for spe ed
int size = 0; int size = 0;
for (int i = 0; quarks[i] != NULLQUARK; ++i) for (int i = 0; quarks[i] != NULLQUARK; ++i)
size += strlen (XrmQuarkToString (quarks[i])) + 1; size += strlen (XrmQuarkToString (quarks[i])) + 1;
pattern = rxvt_temp_buf<char> (size + 1); pattern = rxvt_temp_buf<char> (size + 1);
// now print all components // now print all components
{ {
char *cur = pattern; char *cur = pattern;
 End of changes. 8 change blocks. 
16 lines changed or deleted 17 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)