--- rxvt-unicode/src/xdefaults.C 2004/01/16 22:26:18 1.7 +++ rxvt-unicode/src/xdefaults.C 2007/10/26 18:30:37 1.118 @@ -1,12 +1,12 @@ -/*--------------------------------*-C-*---------------------------------* - * File: xdefaults.c +/*----------------------------------------------------------------------* + * File: xdefaults.C *----------------------------------------------------------------------* - * $Id: xdefaults.C,v 1.7 2004/01/16 22:26:18 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1994 Robert Nation * - original version * Copyright (c) 1997,1998 mj olesen + * Copyright (c) 2003-2006 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,521 +22,564 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *----------------------------------------------------------------------*/ -/*----------------------------------------------------------------------* - * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving - * default or with XGetDefault() (#define USE_XGETDEFAULT) - *----------------------------------------------------------------------*/ -#include "../config.h" /* NECESSARY */ -#include "rxvt.h" /* NECESSARY */ +#include "../config.h" +#include "rxvt.h" #include "version.h" -#include "xdefaults.intpro" /* PROTOS for internal routines */ -/* #define DEBUG_RESOURCES */ +#ifdef KEYSYM_RESOURCE +# include "keyboard.h" +#endif -static const char *const xnames[2] = { ".Xdefaults", ".Xresources" }; +/* place holders used for parsing command-line options */ +#define Optflag_Reverse 1 +#define Optflag_Boolean 2 +#define Optflag_Switch 4 -/*{{{ monolithic option/resource structure: */ +/* monolithic option/resource structure: */ /* * `string' options MUST have a usage argument * `switch' and `boolean' options have no argument - * if there's no desc(ription), it won't appear in rxvt_usage() + * if there's no desc (ription), it won't appear in rxvt_usage () */ -/* INFO() - descriptive information only */ +/* 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 */ +/* 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 */ +/* 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) \ - {(Opt_Boolean|(flag)), (rsp), (kw), (opt), NULL, (desc)} - -/* SWCH() - `-' flag */ -#define SWCH(opt, flag, desc) \ - {(flag), -1, NULL, (opt), NULL, (desc)} +/* BOOL () - regular boolean `-/+' flag */ +#define BOOL(rsp, kw, opt, option, flag, desc) \ + { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} + +/* SWCH () - `-' flag */ +#define SWCH(opt, option, flag, desc) \ + { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} /* convenient macros */ #define optList_strlen(i) \ - (optList[i].flag ? 0 : (optList[i].arg ? STRLEN(optList[i].arg) : 1)) + (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) #define optList_isBool(i) \ - (optList[i].flag & Opt_Boolean) + (optList[i].flag & Optflag_Boolean) #define optList_isReverse(i) \ - (optList[i].flag & Opt_Reverse) -#define optList_size() \ - (sizeof(optList) / sizeof(optList[0])) - -static const struct { - const unsigned long flag; /* Option flag */ - const int doff; /* data offset */ + (optList[i].flag & Optflag_Reverse) +#define optList_size \ + (sizeof (optList) / sizeof (optList[0])) + +static const struct + { + const uint8_t index; /* Option index */ + const uint8_t flag; /* Option flag */ + const int16_t doff; /* resource value index or -1 */ const char *kw; /* keyword */ const char *opt; /* option */ const char *arg; /* argument */ const char *desc; /* description */ -} 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_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"), -#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"), -#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"), - SWCH("tr", Opt_transparent, NULL), + } +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_geometry, NULL, "g", NULL, NULL), /* short form */ + STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), + 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_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip 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, 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, 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 ENABLE_TRANSPARENCY + BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), + BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), + STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), + STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), +#endif +#if OFF_FOCUS_FADING + STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), + STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), #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"), +# if ENABLE_FRILLS + BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), +# endif + 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 -#ifdef MULTICHAR_SET - BOOL(Rs_mc_hack, "multibyte_cursor", "mcc", Opt_mc_hack, - "Multibyte character cursor movement"), -#endif -#ifndef NO_FRILLS - BOOL(Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, - "triple click word selection"), +#if ENABLE_FRILLS + 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 -#ifdef CURSOR_BLINK - BOOL(Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), +#if CURSOR_BLINK + 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"), - RSTRG(Rs_color + minCOLOR + 0, "color0", "color"), - RSTRG(Rs_color + minCOLOR + 1, "color1", "color"), - RSTRG(Rs_color + minCOLOR + 2, "color2", "color"), - RSTRG(Rs_color + minCOLOR + 3, "color3", "color"), - RSTRG(Rs_color + minCOLOR + 4, "color4", "color"), - RSTRG(Rs_color + minCOLOR + 5, "color5", "color"), - RSTRG(Rs_color + minCOLOR + 6, "color6", "color"), - RSTRG(Rs_color + minCOLOR + 7, "color7", "color"), -#ifndef NO_BRIGHTCOLOR - RSTRG(Rs_color + minBrightCOLOR + 0, "color8", "color"), - RSTRG(Rs_color + minBrightCOLOR + 1, "color9", "color"), - RSTRG(Rs_color + minBrightCOLOR + 2, "color10", "color"), - RSTRG(Rs_color + minBrightCOLOR + 3, "color11", "color"), - RSTRG(Rs_color + minBrightCOLOR + 4, "color12", "color"), - RSTRG(Rs_color + minBrightCOLOR + 5, "color13", "color"), - RSTRG(Rs_color + minBrightCOLOR + 6, "color14", "color"), - RSTRG(Rs_color + minBrightCOLOR + 7, "color15", "color"), -#endif /* NO_BRIGHTCOLOR */ + STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), + STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), + RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), + RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), + RSTRG (Rs_color + minCOLOR + 2, "color2", "color"), + RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), + RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), + RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), + RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), + RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), + RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), + RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), + RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), + RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), + RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), + RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), + RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), + RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), #ifndef NO_BOLD_UNDERLINE_REVERSE - RSTRG(Rs_color + Color_BD, "colorBD", "color"), - RSTRG(Rs_color + Color_UL, "colorUL", "color"), - RSTRG(Rs_color + Color_RV, "colorRV", "color"), + RSTRG (Rs_color + Color_BD, "colorBD", "color"), + RSTRG (Rs_color + Color_IT, "colorIT", "color"), + RSTRG (Rs_color + Color_UL, "colorUL", "color"), + RSTRG (Rs_color + Color_RV, "colorRV", "color"), #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ +#if ENABLE_FRILLS + RSTRG (Rs_color + Color_underline, "underlineColor", "color"), +#endif #ifdef KEEP_SCROLLCOLOR - RSTRG(Rs_color + Color_scroll, "scrollColor", "color"), - RSTRG(Rs_color + Color_trough, "troughColor", "color"), + RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), + RSTRG (Rs_color + Color_trough, "troughColor", "color"), #endif /* KEEP_SCROLLCOLOR */ #ifdef OPTION_HC - STRG(Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), + STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), #endif -#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) - RSTRG(Rs_path, "path", "search path"), -#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ -#ifdef XPM_BACKGROUND - STRG(Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", - "background pixmap"), -#endif /* XPM_BACKGROUND */ -#if (MENUBAR_MAX) - RSTRG(Rs_menu, "menu", "name[;tag]"), +#ifndef NO_CURSORCOLOR + STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), + /* command-line option = resource name */ + RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), +#endif /* NO_CURSORCOLOR */ + 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"), +#ifdef BG_IMAGE_FROM_FILE + RSTRG (Rs_path, "path", "search path"), + STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), +#endif + /* fonts: command-line option = resource name */ + STRG (Rs_font, "font", "fn", "fontname", "normal text font"), +#if ENABLE_STYLES + 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, 0, "font styles imply intensity changes"), #endif - STRG(Rs_font, "font", "fn", "fontname", "normal text font"), -/* 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"), -#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - STRG(Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), -#endif + STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), + STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), + STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), + STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), #endif /* USE_XIM */ -#ifdef GREEK_SUPPORT - STRG(Rs_greek_keyboard, "greek_keyboard", "grk", "mode", - "greek keyboard mapping; mode = iso | ibm"), - RSTRG(Rs_greektoggle_key, "greektoggle_key", "keysym"), -#endif - 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"), -#ifndef NO_CURSORCOLOR - STRG(Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), -/* 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"), -#ifndef NO_FRILLS - 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"), -#endif -#ifndef NO_LINESPACE - STRG(Rs_lineSpace, "lineSpace", "lsp", "number", - "number of extra pixels between rows"), + 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"), + STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), +#if ENABLE_XEMBED + STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), +#endif +#if XFT + STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), +#endif +#if ENABLE_FRILLS + RSTRG (Rs_transient_for, "transient-for", "windowid"), + 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, 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, 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 - STRG(Rs_scrollBar_thickness, "thickness", "sbt", "number", - "scrollbar thickness/width in pixels"), #ifdef POINTER_BLANK - RSTRG(Rs_pointerBlankDelay, "pointerBlankDelay", "number"), + RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), #endif #ifndef NO_BACKSPACE_KEY - RSTRG(Rs_backspace_key, "backspacekey", "string"), + RSTRG (Rs_backspace_key, "backspacekey", "string"), #endif #ifndef NO_DELETE_KEY - RSTRG(Rs_delete_key, "deletekey", "string"), -#endif - RSTRG(Rs_selectstyle, "selectstyle", "mode"), - RSTRG(Rs_scrollstyle, "scrollstyle", "mode"), -#ifdef HAVE_SCROLLBARS - RSTRG(Rs_scrollBar_align, "scrollBar_align", "mode"), + RSTRG (Rs_delete_key, "deletekey", "string"), #endif + RSTRG (Rs_selectstyle, "selectstyle", "mode"), #ifdef PRINTPIPE - RSTRG(Rs_print_pipe, "print-pipe", "string"), + RSTRG (Rs_print_pipe, "print-pipe", "string"), #endif -#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) - RSTRG(Rs_bigfont_key, "bigfont_key", "keysym"), - RSTRG(Rs_smallfont_key, "smallfont_key", "keysym"), -#endif - STRG(Rs_modifier, "modifier", "mod", "modifier", - "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), - INFO("xrm", "string", "X resource"), + STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), #ifdef CUTCHAR_RESOURCE - RSTRG(Rs_cutchars, "cutchars", "string"), + RSTRG (Rs_cutchars, "cutchars", "string"), #endif /* CUTCHAR_RESOURCE */ -#ifdef ACS_ASCII - RSTRG(Rs_acs_chars, "acsChars", "string"), -#endif /* ACS_ASCII */ - RSTRG(Rs_answerbackstring, "answerbackString", "string"), - INFO("e", "command arg ...", "command to execute") -}; + RSTRG (Rs_answerbackstring, "answerbackString", "string"), +#ifndef NO_SECONDARY_SCREEN + 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 + 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-separated 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"), +#endif +#if ISO_14755 + BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), +#endif +#ifdef HAVE_AFTERIMAGE + STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), + STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), +#endif +#ifndef NO_RESOURCES + INFO ("xrm", "string", "X resource"), +#endif + INFO ("e", "command arg ...", "command to execute") + }; #undef INFO #undef STRG #undef RSTRG #undef SWCH #undef BOOL -/*}}} */ -static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; -static const char optionsstring[] = "Options: " -#if defined(XPM_BACKGROUND) - "XPM," +static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; +static const char optionsstring[] = "options: " +#if ENABLE_PERL + "perl," +#endif +#if XFT + "xft," +#endif +#if ENABLE_STYLES + "styles," #endif -#if defined(TRANSPARENT) - "transparent," +#if ENABLE_COMBINING + "combining," #endif -#if defined(UTMP_SUPPORT) - "utmp," +#if TEXT_BLINK + "blink," #endif -#if defined(MENUBAR) - "menubar," +#if ISO_14755 + "iso14755," #endif -#if !defined(NO_FRILLS) - "frills," +#if UNICODE_3 + "unicode3," #endif -#if !defined(NO_LINESPACE) - "linespace," + "encodings=eu+vn" +#if ENCODING_JP + "+jp" #endif -#if defined(PREFER_24BIT) - "24bit," +#if ENCODING_JP_EXT + "+jp-ext" +#endif +#if ENCODING_KR + "+kr" +#endif +#if ENCODING_ZH + "+zh" +#endif +#if ENCODING_ZH_EXT + "+zh-ext" +#endif + "," +#if OFF_FOCUS_FADING + "fade," +#endif +#if defined(ENABLE_TRANSPARENCY) + "transparent," + "tint," +#endif +#if HAVE_AFTERIMAGE + "afterimage," #endif #if defined(USE_XIM) - "XIM," + "XIM," +#endif +#if defined(NO_BACKSPACE_KEY) + "no_backspace," +#endif +#if defined(NO_DELETE_KEY) + "no_delete," #endif -#if defined(MULTICHAR_SET) - "multichar_languages," +#if EIGHT_BIT_CONTROLS + "8bitctrls," +#endif +#if defined(ENABLE_FRILLS) + "frills," +#endif +#if defined(SELECTION_SCROLLING) + "selectionscrolling," +#endif +#if MOUSE_WHEEL + "wheel," +#endif +#if MOUSE_SLIP_WHEELING + "slipwheel," +#endif +#if defined(SMART_RESIZE) + "smart-resize," +#endif +#if defined(CURSOR_BLINK) + "cursorBlink," +#endif +#if defined(POINTER_BLANK) + "pointerBlank," +#endif +#if defined(NO_RESOURCES) + "NoResources," #endif - "scrollbars=" + "scrollbars=" #if !defined(HAVE_SCROLLBARS) - "NONE" + "NONE" #else +# if defined(PLAIN_SCROLLBAR) + "plain" +# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) + "+" +# endif +# endif # if defined(RXVT_SCROLLBAR) - "rxvt" + "rxvt" # if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) - "+" + "+" # endif # endif # if defined(NEXT_SCROLLBAR) - "NeXT" + "NeXT" # if defined(XTERM_SCROLLBAR) - "+" + "+" # endif # endif # if defined(XTERM_SCROLLBAR) - "xterm" -# endif -#endif - "," -#if defined(GREEK_SUPPORT) - "Greek," -#endif -#if defined(RXVT_GRAPHICS) - "graphics," -#endif -#if defined(NO_BACKSPACE_KEY) - "no_backspace," -#endif -#if defined(NO_DELETE_KEY) - "no_delete," -#endif -#if !defined(NO_STRINGS) - "strings," -#endif -#if defined(TTY_256COLOR) - "256colour," -#endif -#if defined(NO_RESOURCES) - "NoResources" -#else -# if defined(USE_XGETDEFAULT) - "XGetDefaults" -# else - ".Xdefaults" + "xterm" # endif #endif - "\nUsage: "; /* Usage */ + "\nUsage: "; /* Usage */ #define INDENT 18 +const char rxvt_term::resval_undef [] = ""; +const char rxvt_term::resval_on [] = "on"; +const char rxvt_term::resval_off [] = "off"; + /*{{{ usage: */ /*----------------------------------------------------------------------*/ -/* EXTPROTO */ -void -rxvt_usage(int type) +static void +rxvt_usage (int type) { - unsigned int i, col; + unsigned int i, col; + + rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); - write(STDERR_FILENO, releasestring, sizeof(releasestring) - 1); - write(STDERR_FILENO, optionsstring, sizeof(optionsstring) - 1); - write(STDERR_FILENO, APL_NAME, sizeof(APL_NAME) - 1); - - switch (type) { - case 0: /* brief listing */ - fprintf(stderr, " [-help] [--help]\n"); - for (col = 1, i = 0; i < optList_size(); i++) - if (optList[i].desc != NULL) { - int len = 0; - - if (!optList_isBool(i)) { - len = optList_strlen(i); - if (len > 0) - len++; /* account for space */ - } + switch (type) + { + case 0: /* brief listing */ + rxvt_log (" [-help] [--help]\n"); + + for (col = 1, i = 0; i < optList_size; i++) + if (optList[i].desc != NULL) + { + int len = 0; + + if (!optList_isBool (i)) + { + len = optList_strlen (i); + if (len > 0) + len++; /* account for space */ + } #ifdef DEBUG_STRICT - assert(optList[i].opt != NULL); + assert (optList[i].opt != NULL); #endif - len += 4 + STRLEN(optList[i].opt) + (optList_isBool(i) ? 2: 0); - col += len; - if (col > 79) { /* assume regular width */ - putc('\n', stderr); - col = 1 + len; - } - fprintf(stderr, " [-%s%s", (optList_isBool(i) ? "/+" : ""), - optList[i].opt); - if (optList_strlen(i)) - fprintf(stderr, " %s]", optList[i].arg); - else - fprintf(stderr, "]"); - } - break; - - case 1: /* full command-line listing */ - fprintf(stderr, " [options] [-e command args]\n\n" - "where options include:\n"); - for (i = 0; i < optList_size(); i++) - if (optList[i].desc != NULL) { + len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); + col += len; + if (col > 79) + { /* assume regular width */ + rxvt_log ("\n"); + col = 1 + len; + } + + rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); + if (optList_strlen (i)) + rxvt_log (" %s]", optList[i].arg); + else + rxvt_log ("]"); + } + break; + + case 1: /* full command-line listing */ + rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); + + for (i = 0; i < optList_size; i++) + if (optList[i].desc != NULL) + { #ifdef DEBUG_STRICT - assert(optList[i].opt != NULL); + assert (optList[i].opt != NULL); #endif - fprintf(stderr, " %s%s %-*s%s%s\n", - (optList_isBool(i) ? "-/+" : "-"), optList[i].opt, - (INDENT - STRLEN(optList[i].opt) - + (optList_isBool(i) ? 0 : 2)), - (optList[i].arg ? optList[i].arg : ""), - (optList_isBool(i) ? "turn on/off " : ""), - optList[i].desc); - } - fprintf(stderr, "\n --help to list long-options"); - break; - - case 2: /* full resource listing */ - fprintf(stderr, - " [options] [-e command args]\n\n" - "where resources (long-options) include:\n"); - - for (i = 0; i < optList_size(); i++) - if (optList[i].kw != NULL) - fprintf(stderr, " %s: %*s%s\n", - optList[i].kw, - (INDENT - STRLEN(optList[i].kw)), "", /* XXX */ - (optList_isBool(i) ? "boolean" : optList[i].arg)); + rxvt_log (" %s%s %-*s%s%s\n", + (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, + (INDENT - strlen (optList[i].opt) + + (optList_isBool (i) ? 0 : 2)), + (optList[i].arg ? optList[i].arg : ""), + (optList_isBool (i) ? "turn on/off " : ""), + optList[i].desc); + } + rxvt_log ("\n --help to list long-options"); + break; + + case 2: /* full resource listing */ + rxvt_log (" [options] [-e command args]\n\n" + "where resources (long-options) include:\n"); + + for (i = 0; i < optList_size; i++) + if (optList[i].kw != NULL) + rxvt_log (" %s: %*s%s\n", + optList[i].kw, + (INDENT - strlen (optList[i].kw)), "", /* XXX */ + (optList_isBool (i) ? "boolean" : optList[i].arg)); #ifdef KEYSYM_RESOURCE - fprintf(stderr, " " "keysym.sym" ": %*s%s\n", - (INDENT - sizeof("keysym.sym") + 1), "", /* XXX */ - "keysym"); + rxvt_log (" " "keysym.sym" ": %*s%s\n", + (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ + "keysym"); #endif - fprintf(stderr, "\n -help to list options"); - break; + rxvt_log ("\n -help to list options"); + break; } - fprintf(stderr, "\n\n"); - exit(EXIT_FAILURE); - /* NOTREACHED */ + + rxvt_log ("\n\n"); + rxvt_exit_failure (); + /* NOTREACHED */ } /*}}} */ /*{{{ get command-line options before getting resources */ -/* EXTPROTO */ void -rxvt_get_options(pR_ int argc, const char *const *argv) +rxvt_term::get_options (int argc, const char *const *argv) { - int i, bad_option = 0; - static const char On[3] = "ON", Off[4] = "OFF"; + int i, bad_option = 0; - for (i = 1; i < argc; i++) { - unsigned int entry, longopt = 0; - const char *flag, *opt; - - opt = argv[i]; -#ifdef DEBUG_RESOURCES - fprintf(stderr, "argv[%d] = %s: ", i, opt); -#endif - if (*opt == '-') { - flag = On; - if (*++opt == '-') - longopt = *opt++; /* long option */ - } else if (*opt == '+') { - flag = Off; - if (*++opt == '+') - longopt = *opt++; /* long option */ - } else { - bad_option = 1; - rxvt_print_error("bad option \"%s\"", opt); - continue; - } - - if (!STRCMP(opt, "help")) - rxvt_usage(longopt ? 2 : 1); - if (!STRCMP(opt, "h")) - rxvt_usage(0); - - /* feature: always try to match long-options */ - for (entry = 0; entry < optList_size(); entry++) - if ((optList[entry].kw && !STRCMP(opt, optList[entry].kw)) - || (!longopt - && optList[entry].opt && !STRCMP(opt, optList[entry].opt))) - break; - - if (entry < optList_size()) { - if (optList_isReverse(entry)) - flag = flag == On ? Off : On; - if (optList_strlen(entry)) { /* string value */ - const char *str = argv[++i]; - -#ifdef DEBUG_RESOURCES - fprintf(stderr, "string (%s,%s) = ", - optList[entry].opt ? optList[entry].opt : "nil", - optList[entry].kw ? optList[entry].kw : "nil"); -#endif - if (flag == On && str && (optList[entry].doff != -1)) { -#ifdef DEBUG_RESOURCES - fprintf(stderr, "\"%s\"\n", str); -#endif - R->rs[optList[entry].doff] = str; - /* - * special cases are handled in main.c:main() to allow - * X resources to set these values before we settle for - * default values - */ - } -#ifdef DEBUG_RESOURCES - else - fprintf(stderr, "???\n"); -#endif - } else { /* boolean value */ -#ifdef DEBUG_RESOURCES - fprintf(stderr, "boolean (%s,%s) = %s\n", - optList[entry].opt, optList[entry].kw, flag); -#endif - if (flag == On) - R->Options |= (optList[entry].flag); - else - R->Options &= ~(optList[entry].flag); - - if (optList[entry].doff != -1) - R->rs[optList[entry].doff] = flag; - } - } else -#ifdef KEYSYM_RESOURCE - /* if (!STRNCMP(opt, "keysym.", sizeof("keysym.") - 1)) */ - if (rxvt_Str_match(opt, "keysym.")) { - const char *str = argv[++i]; - - if (str != NULL) - rxvt_parse_keysym(aR_ opt + sizeof("keysym.") - 1, str); - } else -#endif + for (i = 1; i < argc; i++) + { + unsigned int entry, longopt = 0; + const char *flag, *opt; + + opt = argv[i]; + + if (*opt == '-') + { + flag = resval_on; + + if (*++opt == '-') + longopt = *opt++; /* long option */ + } + else if (*opt == '+') + { + flag = resval_off; + + if (*++opt == '+') + longopt = *opt++; /* long option */ + } + else + { bad_option = 1; + rxvt_warn ("\"%s\": malformed option.\n", opt); + continue; + } + + if (!strcmp (opt, "help")) + rxvt_usage (longopt ? 2 : 1); + + if (!strcmp (opt, "h")) + rxvt_usage (0); + + /* feature: always try to match long-options */ + for (entry = 0; entry < optList_size; entry++) + if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) + || (!longopt + && optList[entry].opt && !strcmp (opt, optList[entry].opt))) + break; + + if (entry < optList_size) + { + if (optList_isReverse (entry)) + flag = flag == resval_on ? resval_off : resval_on; + + if (optList_strlen (entry)) + { + /* + * special cases are handled in main.c:main () to allow + * X resources to set these values before we settle for + * default values + */ + + if (optList[entry].doff != -1) + { + if (flag == resval_on && i+1 == argc) + rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); + + rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; + } + } + else + { /* boolean value */ + set_option (optList[entry].index, flag == resval_on); + + if (optList[entry].doff != -1) + rs[optList[entry].doff] = flag; + } + } + else +#ifdef KEYSYM_RESOURCE + if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) + { + if (i+1 < argc) + parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]); + } + else +#endif + { + bad_option = 1; + rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); + } } - if (bad_option) - rxvt_usage(0); + if (bad_option) + rxvt_usage (0); } /*}}} */ @@ -552,18 +595,22 @@ * value will be a string */ /* ARGSUSED */ -/* INTPROTO */ -Bool -rxvt_define_key(XrmDatabase *database __attribute__((unused)), XrmBindingList bindings __attribute__((unused)), XrmQuarkList quarks, XrmRepresentation *type __attribute__((unused)), XrmValue *value, XPointer closure __attribute__((unused))) +int +rxvt_define_key (XrmDatabase *database UNUSED, + XrmBindingList bindings UNUSED, + XrmQuarkList quarks, + XrmRepresentation *type UNUSED, + XrmValue *value, + XPointer closure UNUSED) { - dR; - int last; + int last; + + for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ + ; - for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ - ; - last--; - rxvt_parse_keysym(aR_ XrmQuarkToString(quarks[last]), (char *)value->addr); - return False; + last--; + GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO + return False; } /* @@ -575,420 +622,250 @@ * non-NULL for command-line options (need to allocate) */ #define NEWARGLIM 500 /* `reasonable' size */ -/* INTPROTO */ -int -rxvt_parse_keysym(pR_ const char *str, const char *arg) + +struct keysym_vocabulary_t { - int n, sym; - char *key_string, *newarg = NULL; - char newargstr[NEWARGLIM]; - - if (arg == NULL) { - if ((n = rxvt_Str_match(str, "keysym.")) == 0) - return 0; - str += n; /* skip `keysym.' */ - } -/* some scanf() have trouble with a 0x prefix */ - if (isdigit(str[0])) { - if (str[0] == '0' && toupper(str[1]) == 'X') - str += 2; - if (arg) { - if (sscanf(str, (STRCHR(str, ':') ? "%x:" : "%x"), &sym) != 1) - return -1; - } else { - if (sscanf(str, "%x:", &sym) != 1) - return -1; - - /* cue to ':', it's there since sscanf() worked */ - STRNCPY(newargstr, STRCHR(str, ':') + 1, NEWARGLIM - 1); - newargstr[NEWARGLIM - 1] = '\0'; - newarg = newargstr; - } - } else { - /* - * convert keysym name to keysym number - */ - STRNCPY(newargstr, str, NEWARGLIM - 1); - newargstr[NEWARGLIM - 1] = '\0'; - if (arg == NULL) { - if ((newarg = STRCHR(newargstr, ':')) == NULL) - return -1; - *newarg++ = '\0'; /* terminate keysym name */ - } - if ((sym = XStringToKeysym(newargstr)) == None) - return -1; - } + const char *name; + unsigned short len; + unsigned short value; +}; +keysym_vocabulary_t keysym_vocabulary[] = +{ + { "ISOLevel3", 9, Level3Mask }, + { "AppKeypad", 9, AppKeypadMask }, + { "Control", 7, ControlMask }, + { "NumLock", 7, NumLockMask }, + { "Shift", 5, ShiftMask }, + { "Meta", 4, MetaMask }, + { "Lock", 4, LockMask }, + { "Mod1", 4, Mod1Mask }, + { "Mod2", 4, Mod2Mask }, + { "Mod3", 4, Mod3Mask }, + { "Mod4", 4, Mod4Mask }, + { "Mod5", 4, Mod5Mask }, + { "I", 1, Level3Mask }, + { "K", 1, AppKeypadMask }, + { "C", 1, ControlMask }, + { "N", 1, NumLockMask }, + { "S", 1, ShiftMask }, + { "M", 1, MetaMask }, + { "A", 1, MetaMask }, + { "L", 1, LockMask }, + { "1", 1, Mod1Mask }, + { "2", 1, Mod2Mask }, + { "3", 1, Mod3Mask }, + { "4", 1, Mod4Mask }, + { "5", 1, Mod5Mask }, +}; - if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */ - return -1; - sym &= 0xFF; - if (R->Keysym_map[sym] != NULL) /* already set ? */ - return -1; - - if (newarg == NULL) { - STRNCPY(newargstr, arg, NEWARGLIM - 1); - newargstr[NEWARGLIM - 1] = '\0'; - newarg = newargstr; - } - rxvt_Str_trim(newarg); - if (*newarg == '\0' || (n = rxvt_Str_escaped(newarg)) == 0) - return -1; - MIN_IT(n, 255); - key_string = (char *)rxvt_malloc((n + 1) * sizeof(char)); - - key_string[0] = n; - STRNCPY(key_string + 1, newarg, n); - R->Keysym_map[sym] = (unsigned char *)key_string; +int +rxvt_term::parse_keysym (const char *str, const char *arg) +{ + int n, sym; + unsigned int state = 0; + const char *pmodend = NULL; + char *newarg = NULL; + char newargstr[NEWARGLIM]; - return 1; -} + if (arg == NULL) + { + n = sizeof ("keysym.") - 1; + if (strncmp (str, "keysym.", n)) + return 0; + + str += n; /* skip `keysym.' */ + if (!(pmodend = strchr (str, ':'))) + return -1; + } + else + pmodend = str + strlen(str); + + for (--pmodend; str < pmodend; --pmodend) + if (*pmodend == '-') + break; -# endif /* KEYSYM_RESOURCE */ + while (str < pmodend) + { + unsigned int i; -# ifndef USE_XGETDEFAULT -/*{{{ rxvt_get_xdefaults() */ -/* - * the matching algorithm used for memory-save fake resources - */ -/* INTPROTO */ -void -rxvt_get_xdefaults(pR_ FILE *stream, const char *name) -{ - unsigned int len; - char *str, buffer[256]; + for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) + { + if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) + { + state |= keysym_vocabulary[i].value; + str += keysym_vocabulary[i].len; + break; + } + } + + if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) + return -1; - if (stream == NULL) - return; - len = STRLEN(name); - while ((str = fgets(buffer, sizeof(buffer), stream)) != NULL) { - unsigned int entry, n; - - while (*str && isspace(*str)) - str++; /* leading whitespace */ - - if ((str[len] != '*' && str[len] != '.') - || (len && STRNCMP(str, name, len))) - continue; - str += (len + 1); /* skip `name*' or `name.' */ + if (*str == '-') + ++str; + } -# ifdef KEYSYM_RESOURCE - if (!rxvt_parse_keysym(aR_ str, NULL)) -# endif /* KEYSYM_RESOURCE */ - for (entry = 0; entry < optList_size(); entry++) { - const char *kw = optList[entry].kw; + /* some scanf () have trouble with a 0x prefix */ + if (str[0] == '0' && toupper (str[1]) == 'X') + { + str += 2; - if (kw == NULL) - continue; - n = STRLEN (kw); - if (str[n] == ':' && rxvt_Str_match(str, kw)) { - /* skip `keyword:' */ - str += (n + 1); - rxvt_Str_trim(str); - n = STRLEN(str); - if (n && R->rs[optList[entry].doff] == NULL) { - /* not already set */ - int s; - char *p = (char *)rxvt_malloc((n + 1) * sizeof(char)); - - STRCPY(p, str); - R->rs[optList[entry].doff] = p; - if (optList_isBool(entry)) { - s = STRCASECMP(str, "TRUE") == 0 - || STRCASECMP(str, "YES") == 0 - || STRCASECMP(str, "ON") == 0 - || STRCASECMP(str, "1") == 0; - if (optList_isReverse(entry)) - s = !s; - if (s) - R->Options |= (optList[entry].flag); - else - R->Options &= ~(optList[entry].flag); - } - } - break; - } - } + if (arg) + { + if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) + return -1; + } + else + { + if (sscanf (str, "%x:", &sym) != 1) + return -1; + + /* cue to ':', it's there since sscanf () worked */ + strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1); + newargstr[NEWARGLIM - 1] = '\0'; + newarg = newargstr; + } } - rewind(stream); -} + else + { + /* + * convert keysym name to keysym number + */ + strncpy (newargstr, str, NEWARGLIM - 1); + newargstr[NEWARGLIM - 1] = '\0'; -/*}}} */ -# endif /* ! USE_XGETDEFAULT */ -#endif /* NO_RESOURCES */ + if (arg == NULL) + { + if ((newarg = strchr (newargstr, ':')) == NULL) + return -1; -/*{{{ read the resources files */ -/* - * using XGetDefault() or the hand-rolled replacement - */ -/* ARGSUSED */ -/* EXTPROTO */ -void -rxvt_extract_resources(pR_ Display *display __attribute__((unused)), const char *name) -{ -#ifndef NO_RESOURCES + *newarg++ = '\0'; /* terminate keysym name */ + } -# if defined XAPPLOADDIR -# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - /* Compute the path of the possibly available localized Rxvt file */ - char *localepath = NULL; - - if (R->locale != NULL) { /* XXX: must limit length of string */ - localepath = (char *)rxvt_malloc(256); - sprintf(localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, - (int)(258 - sizeof(XAPPLOADDIRLOCALE) - sizeof(APL_SUBCLASS)), - R->locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ + if ((sym = XStringToKeysym (newargstr)) == None) + return -1; } + if (newarg == NULL) { -# endif -# endif + strncpy (newargstr, arg, NEWARGLIM - 1); + newargstr[NEWARGLIM - 1] = '\0'; + newarg = newargstr; + } -# ifdef USE_XGETDEFAULT -/* - * get resources using the X library function - */ - int entry; + if (*newarg == '\0') + return -1; -# ifdef XrmEnumOneLevel - int i; - char *displayResource, *xe; - XrmName name_prefix[3]; - XrmClass class_prefix[3]; - XrmDatabase database, rdb1; - char fname[1024]; - - XrmInitialize(); - database = NULL; - -/* Get any Xserver defaults */ - - displayResource = XResourceManagerString(display); - if (displayResource != NULL) - database = XrmGetStringDatabase(displayResource); + keyboard->register_user_translation (sym, state, newarg); + return 1; +} -# ifdef HAVE_EXTRA_XRESOURCE_FILES -/* Add in ~/.Xdefaults or ~/.Xresources */ - { - char *ptr; +# endif /* KEYSYM_RESOURCE */ +#endif /* NO_RESOURCES */ - if ((ptr = (char *)getenv("HOME")) == NULL) - ptr = "."; +static char * +get_res (XrmDatabase database, const char *program, const char *option) +{ + char resource[512]; + char *type; + XrmValue result; - for (i = 0; i < (sizeof(xnames) / sizeof(xnames[0])); i++) { - sprintf(fname, "%-.*s/%s", sizeof(fname) - STRLEN(xnames[i]) - 2, - ptr, xnames[i]); - if ((rdb1 = XrmGetFileDatabase(fname)) != NULL) { - XrmMergeDatabases(rdb1, &database); -# ifndef HAVE_BOTH_XRESOURCE_FILES - break; -# endif - } - } - } -# endif + snprintf (resource, sizeof (resource), "%s.%s", program, option); + XrmGetResource (database, resource, resource, &type, &result); -/* Add in XENVIRONMENT file */ + return result.addr; +} - if ((xe = (char *)getenv("XENVIRONMENT")) != NULL - && (rdb1 = XrmGetFileDatabase(xe)) != NULL) - XrmMergeDatabases(rdb1, &database); - -/* Add in Rxvt file */ -# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - if (localepath == NULL || (rdb1 = XrmGetFileDatabase(localepath)) == NULL) -# endif - rdb1 = XrmGetFileDatabase(XAPPLOADDIR "/" APL_SUBCLASS); - if (rdb1 != NULL) - XrmMergeDatabases(rdb1, &database); - -/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ - if ((xe = (char *)getenv("XAPPLRESDIR")) != NULL) { - sprintf(fname, "%-.*s/" APL_SUBCLASS, sizeof(fname) - - sizeof(APL_SUBCLASS) - 2, xe); - if ((rdb1 = XrmGetFileDatabase(fname)) != NULL) - XrmMergeDatabases(rdb1, &database); - } +const char * +rxvt_term::x_resource (const char *name) +{ + XrmDatabase database = XrmGetDatabase (dpy); - XrmSetDatabase(display, database); -# endif + const char *p = get_res (database, rs[Rs_name], name); + const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); -/* - * Query resources for options that affect us - */ - for (entry = 0; entry < optList_size(); entry++) { - int s; - char *p, *p0; - const char *kw = optList[entry].kw; - - if (kw == NULL || R->rs[optList[entry].doff] != NULL) - continue; /* previously set */ - - p = XGetDefault(display, name, kw); - p0 = XGetDefault(display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); - if (p == NULL || (p0 && STRCMP(p, p0) == 0)) { - p = XGetDefault(display, APL_SUBCLASS, kw); - if (p == NULL || (p0 && STRCMP(p, p0) == 0)) - p = XGetDefault(display, APL_CLASS, kw); - } - if (p == NULL && p0) - p = p0; - if (p) { - R->rs[optList[entry].doff] = p; - - if (optList_isBool(entry)) { - s = STRCASECMP(p, "TRUE") == 0 - || STRCASECMP(p, "YES") == 0 - || STRCASECMP(p, "ON") == 0 - || STRCASECMP(p, "1") == 0; - if (optList_isReverse(entry)) - s = !s; - if (s) - R->Options |= (optList[entry].flag); - else - R->Options &= ~(optList[entry].flag); - } - } + if (p == NULL || (p0 && strcmp (p, p0) == 0)) + { + p = get_res (database, RESCLASS, name); +#ifdef RESFALLBACK + if (p == NULL || (p0 && strcmp (p, p0) == 0)) + p = get_res (database, RESFALLBACK, name); +#endif } -/* - * [R5 or later]: enumerate the resource database - */ -# ifdef XrmEnumOneLevel -# ifdef KEYSYM_RESOURCE - name_prefix[0] = XrmStringToName(name); - name_prefix[1] = XrmStringToName("keysym"); - name_prefix[2] = NULLQUARK; - class_prefix[0] = XrmStringToName(APL_SUBCLASS); - class_prefix[1] = XrmStringToName("Keysym"); - class_prefix[2] = NULLQUARK; -/* XXX: Need to check sizeof(rxvt_t) == sizeof(XPointer) */ - XrmEnumerateDatabase(XrmGetDatabase(display), name_prefix, class_prefix, - XrmEnumOneLevel, rxvt_define_key, NULL); - name_prefix[0] = XrmStringToName(APL_CLASS); - name_prefix[1] = XrmStringToName("keysym"); - class_prefix[0] = XrmStringToName(APL_CLASS); - class_prefix[1] = XrmStringToName("Keysym"); -/* XXX: Need to check sizeof(rxvt_t) == sizeof(XPointer) */ - XrmEnumerateDatabase(XrmGetDatabase(display), name_prefix, class_prefix, - XrmEnumOneLevel, rxvt_define_key, NULL); -# endif -# endif - -# else /* USE_XGETDEFAULT */ -/* get resources the hard way, but save lots of memory */ - FILE *fd = NULL; - char *home; - - if ((home = getenv("HOME")) != NULL) { - unsigned int i, len = STRLEN(home) + 2; - char *f = NULL; - - for (i = 0; i < (sizeof(xnames) / sizeof(xnames[0])); i++) { - f = (char *)rxvt_realloc(f, (len + STRLEN(xnames[i])) * sizeof(char)); - - sprintf(f, "%s/%s", home, xnames[i]); - - if ((fd = fopen(f, "r")) != NULL) - break; - } - free(f); - } -/* - * The normal order to match resources is the following: - * @ global resources (partial match, ~/.Xdefaults) - * @ application file resources (XAPPLOADDIR/Rxvt) - * @ class resources (~/.Xdefaults) - * @ private resources (~/.Xdefaults) - * - * However, for the hand-rolled resources, the matching algorithm - * checks if a resource string value has already been allocated - * and won't overwrite it with (in this case) a less specific - * resource value. - * - * This avoids multiple allocation. Also, when we've called this - * routine command-line string options have already been applied so we - * needn't to allocate for those resources. - * - * So, search in resources from most to least specific. - * - * Also, use a special sub-class so that we can use either or both of - * "XTerm" and "Rxvt" as class names. - */ + if (p == NULL && p0) + p = p0; - rxvt_get_xdefaults(aR_ fd, name); - rxvt_get_xdefaults(aR_ fd, APL_SUBCLASS); + return p; +} -# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) +void +rxvt_term::extract_resources () +{ +#ifndef NO_RESOURCES + /* + * Query resources for options that affect us + */ + for (int entry = 0; entry < optList_size; entry++) { - FILE *ad = NULL; + int s; + const char *kw = optList[entry].kw; -# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - if (localepath == NULL || (ad = fopen(localepath, "r")) == NULL) -# endif - ad = fopen(XAPPLOADDIR "/" APL_SUBCLASS, "r"); - if (ad != NULL) { - rxvt_get_xdefaults(aR_ ad, APL_SUBCLASS); - rxvt_get_xdefaults(aR_ ad, ""); - fclose(ad); - } - } -# endif /* XAPPLOADDIR */ - - rxvt_get_xdefaults(aR_ fd, APL_CLASS); - rxvt_get_xdefaults(aR_ fd, ""); /* partial match */ - if (fd != NULL) - fclose(fd); -# endif /* USE_XGETDEFAULT */ + if (kw == NULL || rs[optList[entry].doff] != NULL) + continue; // previously set -# if defined XAPPLOADDIR -# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - } + const char *p = x_resource (kw); - /* Free the path of the possibly available localized Rxvt file */ - free(localepath); + if (p) + { + p = strdup (p); + allocated.push_back ((void *)p); + rs[optList[entry].doff] = p; + + if (optList_isBool (entry)) + { + s = strcasecmp (p, "TRUE") == 0 + || strcasecmp (p, "YES") == 0 + || strcasecmp (p, "ON") == 0 + || strcasecmp (p, "1") == 0; + + if (optList_isReverse (entry)) + s = !s; + + set_option (optList[entry].index, s); + } + } + } + + /* + * [R5 or later]: enumerate the resource database + */ +# ifdef KEYSYM_RESOURCE + XrmDatabase database = XrmGetDatabase (dpy); + XrmName name_prefix[3]; + XrmClass class_prefix[3]; + + name_prefix[0] = XrmStringToName (rs[Rs_name]); + name_prefix[1] = XrmStringToName ("keysym"); + name_prefix[2] = NULLQUARK; + class_prefix[0] = XrmStringToName (RESCLASS); + class_prefix[1] = XrmStringToName ("Keysym"); + class_prefix[2] = NULLQUARK; + /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ + XrmEnumerateDatabase (database, name_prefix, class_prefix, + XrmEnumOneLevel, rxvt_define_key, NULL); +# ifdef RESFALLBACK + name_prefix[0] = XrmStringToName (RESFALLBACK); + name_prefix[1] = XrmStringToName ("keysym"); + class_prefix[0] = XrmStringToName (RESFALLBACK); + class_prefix[1] = XrmStringToName ("Keysym"); + /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ + XrmEnumerateDatabase (database, name_prefix, class_prefix, + XrmEnumOneLevel, rxvt_define_key, NULL); +# endif # endif -# endif #endif /* NO_RESOURCES */ - -/* - * even without resources, at least do this setup for command-line - * options and command-line long options - */ -#ifdef MULTICHAR_SET - rxvt_set_multichar_encoding(aR_ R->rs[Rs_multichar_encoding]); -#endif -#ifdef GREEK_SUPPORT -/* this could be a function in grkelot.c */ -/* void set_greek_keyboard (const char * str); */ - if (R->rs[Rs_greek_keyboard]) { - if (!STRCMP(R->rs[Rs_greek_keyboard], "iso")) - greek_setmode(GREEK_ELOT928); /* former -grk9 */ - else if (!STRCMP(R->rs[Rs_greek_keyboard], "ibm")) - greek_setmode(GREEK_IBM437); /* former -grk4 */ - } - { - KeySym sym; - - if (R->rs[Rs_greektoggle_key] - && ((sym = XStringToKeysym(R->rs[Rs_greektoggle_key])) != 0)) - R->ks_greekmodeswith = sym; - } -#endif /* GREEK_SUPPORT */ - -#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) - { - KeySym sym; - - if (R->rs[Rs_bigfont_key] - && ((sym = XStringToKeysym(R->rs[Rs_bigfont_key])) != 0)) - R->ks_bigfont = sym; - if (R->rs[Rs_smallfont_key] - && ((sym = XStringToKeysym(R->rs[Rs_smallfont_key])) != 0)) - R->ks_smallfont = sym; - } -#endif } -/*}}} */ /*----------------------- end-of-file (C source) -----------------------*/