ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.28 by root, Fri Jul 30 22:36:42 2004 UTC vs.
Revision 1.167 by root, Tue Jun 5 22:23:07 2012 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xdefaults.C 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
… …
20 * 21 *
21 * You should have received a copy of the GNU General Public License 22 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 23 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 25 *----------------------------------------------------------------------*/
25/*----------------------------------------------------------------------*
26 * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving
27 * default or with XGetDefault() (#define USE_XGETDEFAULT)
28 *----------------------------------------------------------------------*/
29 26
30#include "../config.h" /* NECESSARY */ 27#include "../config.h"
31#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h"
32#include "version.h" 29#include "version.h"
33#include "xdefaults.intpro" /* PROTOS for internal routines */
34 30
35/* #define DEBUG_RESOURCES */ 31#ifdef KEYSYM_RESOURCE
32# include "keyboard.h"
33#endif
36 34
37static const char *const xnames[2] = { ".Xdefaults", ".Xresources" }; 35/* place holders used for parsing command-line options */
36#define Optflag_Reverse 1
37#define Optflag_Boolean 2
38#define Optflag_Switch 4
39#define Optflag_Info 8
38 40
39/*{{{ monolithic option/resource structure: */ 41/* monolithic option/resource structure: */
40/* 42/*
41 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
43 * if there's no desc (ription), it won't appear in rxvt_usage () 45 * if there's no desc (ription), it won't appear in rxvt_usage ()
44 */ 46 */
45 47
46/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
47#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
48 {0, -1, NULL, (opt), (arg), (desc)} 50 {0, Optflag_Info, -1, NULL, (opt), (arg), (desc)}
51
52#define RINFO(kw, arg) \
53 {0, Optflag_Info, -1, (kw), NULL, (arg), NULL}
49 54
50/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
51#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
52 {0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
53 58
54/* RSTRG () - resource/long-option */ 59/* RSTRG () - resource/long-option */
55#define RSTRG(rsp, kw, arg) \ 60#define RSTRG(rsp, kw, arg) \
56 {0, (rsp), (kw), NULL, (arg), NULL} 61 {0, 0, (rsp), (kw), NULL, (arg), NULL}
57 62
58/* BOOL () - regular boolean `-/+' flag */ 63/* BOOL () - regular boolean `-/+' flag */
59#define BOOL(rsp, kw, opt, flag, desc) \ 64#define BOOL(rsp, kw, opt, option, flag, desc) \
60 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} 65 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
61 66
62/* SWCH () - `-' flag */ 67/* SWCH () - `-' flag */
63#define SWCH(opt, flag, desc) \ 68#define SWCH(opt, option, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 69 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 70
66/* convenient macros */ 71/* convenient macros */
67#define optList_strlen(i) \ 72#define optList_isString(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? STRLEN (optList[i].arg) : 1)) 73 (optList[i].flag == 0)
69#define optList_isBool(i) \ 74#define optList_isBool(i) \
70 (optList[i].flag & Opt_Boolean) 75 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 76#define optList_isReverse(i) \
72 (optList[i].flag & Opt_Reverse) 77 (optList[i].flag & Optflag_Reverse)
73#define optList_size() \ 78#define optList_isInfo(i) \
74 (sizeof (optList) / sizeof (optList[0])) 79 (optList[i].flag & Optflag_Info)
75 80
76static const struct 81static const struct
77 { 82 {
83 const uint8_t index; /* Option index */
78 const unsigned long flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
79 const int doff; /* data offset */ 85 const int16_t doff; /* resource value index or -1 */
80 const char *kw; /* keyword */ 86 const char *kw; /* keyword */
81 const char *opt; /* option */ 87 const char *opt; /* option */
82 const char *arg; /* argument */ 88 const char *arg; /* argument */
83 const char *desc; /* description */ 89 const char *desc; /* description */
84 } 90 }
… …
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 92 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 93 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), 94 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 95 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
91 SWCH ("C", Opt_console, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
92 SWCH ("iconic", Opt_iconic, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 99 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 102 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
97#ifdef HAVE_SCROLLBARS 104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
106 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
98 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 107 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
99 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 108 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
100 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 109 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
101#endif 110 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
102 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
103 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 113 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
104 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
105 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
106#ifdef TRANSPARENT 116#if ENABLE_TRANSPARENCY
107 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
108 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"), 118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
109 SWCH ("tr", Opt_transparent, NULL),
110#if TINTING
111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
121 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
112#endif 122#endif
113#endif
114#ifdef OFF_FOCUS_FADING 123#if OFF_FOCUS_FADING
115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."), 124 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
125 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
116#endif 126#endif
117#ifdef TINTING
118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
119#endif
120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
121#ifndef NO_BELL 128#ifndef NO_BELL
129# if ENABLE_FRILLS
130 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
131# endif
122 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 132 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
123# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 133# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
124 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 134 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
125# endif 135# endif
126#endif 136#endif
127#ifdef META8_OPTION 137#ifdef META8_OPTION
128 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 138 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
129#endif 139#endif
130#ifdef MOUSE_WHEEL 140#ifdef MOUSE_WHEEL
131 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 141 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
132#endif 142#endif
133#ifndef NO_FRILLS 143#if ENABLE_FRILLS
134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 144 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
135 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 145 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
146 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
136#endif 147#endif
137#ifdef CURSOR_BLINK 148#if CURSOR_BLINK
138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 149 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
139#endif 150#endif
140#ifdef POINTER_BLANK 151#ifdef POINTER_BLANK
141 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 152 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
142#endif 153#endif
143 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 154 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
144 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 155 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
145 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 156 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
146 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 157 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
148 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 159 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
149 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 160 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
150 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 161 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
151 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 162 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
152 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 163 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
153#ifndef NO_BRIGHTCOLOR
154 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
155 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
156 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
157 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
158 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 168 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
159 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 169 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 170 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 171 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
162#endif /* NO_BRIGHTCOLOR */
163#ifndef NO_BOLD_UNDERLINE_REVERSE 172#ifndef NO_BOLD_UNDERLINE_REVERSE
164 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
165 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 173 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
174 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
166 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 175 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
167 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 176 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 177#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
169#ifdef KEEP_SCROLLCOLOR 178#if ENABLE_FRILLS
179 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
180#endif
170 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 181 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
182#ifdef RXVT_SCROLLBAR
171 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
172#endif /* KEEP_SCROLLCOLOR */ 184#endif
173#ifdef OPTION_HC 185#ifdef OPTION_HC
174 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 186 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
187 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
175#endif 188#endif
176#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 189#ifndef NO_CURSORCOLOR
190 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
191 /* command-line option = resource name */
192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
193#endif /* NO_CURSORCOLOR */
194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
197#if BG_IMAGE_FROM_FILE
177 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
178#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
179#ifdef XPM_BACKGROUND
180 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
181#endif /* XPM_BACKGROUND */ 200# if ENABLE_EWMH
182#if (MENUBAR_MAX) 201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
183 RSTRG (Rs_menu, "menu", "name[;tag]"),
184#endif 202# endif
203#endif
204 /* fonts: command-line option = resource name */
185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
186 /* fonts: command-line option = resource name */ 206#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
210 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
211#endif
187#ifdef USE_XIM 212#if USE_XIM
188 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
189 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 214 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
190#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
191 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 215 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
192#endif 216 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
193#endif /* USE_XIM */ 217#endif /* USE_XIM */
194 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 218 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
195 STRG (Rs_title, "title", "title", "string", "title name for window"), 219 STRG (Rs_title, "title", "title", "string", "title name for window"),
196 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 220 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
197 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 221 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
198#ifndef NO_CURSORCOLOR
199 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
200 /* command-line option = resource name */
201 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
202#endif /* NO_CURSORCOLOR */
203 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
204 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
205 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
206 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
207#ifndef NO_FRILLS 223#if ENABLE_XEMBED
224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
225#endif
226#if XFT
227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
229#endif
230#if ENABLE_FRILLS
231 RSTRG (Rs_transient_for, "transient-for", "windowid"),
232 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
233 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
234 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
208 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 235 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 236 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 237 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
211 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 238 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
212#endif 239 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
213#ifndef NO_LINESPACE
214 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 240 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
241 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
215#endif 242#endif
216 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 243#ifdef BUILTIN_GLYPHS
244 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
245#endif
217#ifdef POINTER_BLANK 246#ifdef POINTER_BLANK
218 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 247 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
219#endif 248#endif
220#ifndef NO_BACKSPACE_KEY 249#ifndef NO_BACKSPACE_KEY
221 RSTRG (Rs_backspace_key, "backspacekey", "string"), 250 RSTRG (Rs_backspace_key, "backspacekey", "string"),
222#endif 251#endif
223#ifndef NO_DELETE_KEY 252#ifndef NO_DELETE_KEY
224 RSTRG (Rs_delete_key, "deletekey", "string"), 253 RSTRG (Rs_delete_key, "deletekey", "string"),
225#endif 254#endif
226 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
227 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
228#ifdef HAVE_SCROLLBARS
229 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
230#endif
231#ifdef PRINTPIPE 255#ifdef PRINTPIPE
232 RSTRG (Rs_print_pipe, "print-pipe", "string"), 256 RSTRG (Rs_print_pipe, "print-pipe", "string"),
233#endif 257#endif
234 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 258 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
235 INFO ("xrm", "string", "X resource"),
236#ifdef CUTCHAR_RESOURCE
237 RSTRG (Rs_cutchars, "cutchars", "string"), 259 RSTRG (Rs_cutchars, "cutchars", "string"),
238#endif /* CUTCHAR_RESOURCE */
239 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 260 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
240#ifndef NO_SECONDARY_SCREEN 261#ifndef NO_SECONDARY_SCREEN
241 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 262 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
242 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 263 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
264#endif
265#if ENABLE_PERL
266 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
267 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
268 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
269 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
270#endif
271#if ISO_14755
272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
273 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
274#endif
275#ifndef NO_RESOURCES
276 RINFO ("xrm", "string"),
277#endif
278#ifdef KEYSYM_RESOURCE
279 RINFO ("keysym.sym", "keysym"),
243#endif 280#endif
244 INFO ("e", "command arg ...", "command to execute") 281 INFO ("e", "command arg ...", "command to execute")
245 }; 282 };
246 283
247#undef INFO 284#undef INFO
285#undef RINFO
248#undef STRG 286#undef STRG
249#undef RSTRG 287#undef RSTRG
250#undef SWCH 288#undef SWCH
251#undef BOOL 289#undef BOOL
252/*}}} */
253 290
254static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 291static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
255static const char optionsstring[] = "Options: " 292static const char optionsstring[] = "options: "
256#if defined(XPM_BACKGROUND) 293#if ENABLE_PERL
294 "perl,"
295#endif
296#if XFT
297 "xft,"
298#endif
299#if ENABLE_STYLES
300 "styles,"
301#endif
302#if ENABLE_COMBINING
303 "combining,"
304#endif
305#if TEXT_BLINK
306 "blink,"
307#endif
308#if ISO_14755
309 "iso14755,"
310#endif
311#if UNICODE_3
312 "unicode3,"
313#endif
314 "encodings=eu+vn"
315#if ENCODING_JP
316 "+jp"
317#endif
318#if ENCODING_JP_EXT
319 "+jp-ext"
320#endif
321#if ENCODING_KR
322 "+kr"
323#endif
324#if ENCODING_ZH
325 "+zh"
326#endif
327#if ENCODING_ZH_EXT
328 "+zh-ext"
329#endif
257 "XPM," 330 ","
331#if OFF_FOCUS_FADING
332 "fade,"
258#endif 333#endif
259#if defined(TRANSPARENT) 334#if defined(ENABLE_TRANSPARENCY)
260 "transparent," 335 "transparent,"
261#endif
262#if defined(UTMP_SUPPORT)
263 "utmp,"
264#endif
265#if defined(MENUBAR)
266 "menubar,"
267#endif
268#if !defined(NO_FRILLS)
269 "frills,"
270#endif
271#if !defined(NO_LINESPACE)
272 "linespace,"
273#endif
274#if defined(PREFER_24BIT)
275 "24bit," 336 "tint,"
337#endif
338#if HAVE_PIXBUF
339 "pixbuf,"
276#endif 340#endif
277#if defined(USE_XIM) 341#if defined(USE_XIM)
278 "XIM," 342 "XIM,"
279#endif 343#endif
280 "scrollbars="
281#if !defined(HAVE_SCROLLBARS)
282 "NONE"
283#else
284# if defined(PLAIN_SCROLLBAR)
285 "plain"
286# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
287 "+"
288# endif
289# endif
290# if defined(RXVT_SCROLLBAR)
291 "rxvt"
292# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
293 "+"
294# endif
295# endif
296# if defined(NEXT_SCROLLBAR)
297 "NeXT"
298# if defined(XTERM_SCROLLBAR)
299 "+"
300# endif
301# endif
302# if defined(XTERM_SCROLLBAR)
303 "xterm"
304# endif
305#endif
306 ","
307#if defined(NO_BACKSPACE_KEY) 344#if defined(NO_BACKSPACE_KEY)
308 "no_backspace," 345 "no_backspace,"
309#endif 346#endif
310#if defined(NO_DELETE_KEY) 347#if defined(NO_DELETE_KEY)
311 "no_delete," 348 "no_delete,"
312#endif 349#endif
313#if !defined(NO_STRINGS) 350#if EIGHT_BIT_CONTROLS
351 "8bitctrls,"
352#endif
353#if defined(ENABLE_FRILLS)
314 "strings," 354 "frills,"
315#endif 355#endif
316#if defined(TTY_256COLOR) 356#if defined(SELECTION_SCROLLING)
357 "selectionscrolling,"
358#endif
359#if MOUSE_WHEEL
317 "256colour," 360 "wheel,"
361#endif
362#if MOUSE_SLIP_WHEELING
363 "slipwheel,"
364#endif
365#if defined(SMART_RESIZE)
366 "smart-resize,"
367#endif
368#if defined(CURSOR_BLINK)
369 "cursorBlink,"
370#endif
371#if defined(POINTER_BLANK)
372 "pointerBlank,"
318#endif 373#endif
319#if defined(NO_RESOURCES) 374#if defined(NO_RESOURCES)
320 "NoResources" 375 "NoResources,"
321#else
322# if defined(USE_XGETDEFAULT)
323 "XGetDefaults"
324# else
325 ".Xdefaults"
326# endif 376#endif
377 "scrollbars=plain"
378#if defined(RXVT_SCROLLBAR)
379 "+rxvt"
380#endif
381#if defined(NEXT_SCROLLBAR)
382 "+NeXT"
383#endif
384#if defined(XTERM_SCROLLBAR)
385 "+xterm"
327#endif 386#endif
328 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
329 388
330#define INDENT 18 389#define INDENT 18
390
391const char rxvt_term::resval_undef [] = "<undef>";
392const char rxvt_term::resval_on [] = "on";
393const char rxvt_term::resval_off [] = "off";
331 394
332/*{{{ usage: */ 395/*{{{ usage: */
333/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
334static void 397void
335rxvt_usage (int type) 398rxvt_term::rxvt_usage (int type)
336{ 399{
337 unsigned int i, col; 400 unsigned int i, col;
338 401
339 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 402 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
340 403
341 switch (type) 404 switch (type)
342 { 405 {
343 case 0: /* brief listing */ 406 case 0: /* brief listing */
344 rxvt_log (" [-help] [--help]\n"); 407 rxvt_log (" [-help] [--help]\n");
345 408
346 for (col = 1, i = 0; i < optList_size (); i++) 409 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
347 if (optList[i].desc != NULL) 410 if (optList[i].desc != NULL)
348 { 411 {
349 int len = 0; 412 int len = 0;
350 413
351 if (!optList_isBool (i)) 414 if (optList[i].arg)
415 len = strlen (optList[i].arg) + 1;
416
417 assert (optList[i].opt != NULL);
418 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
419 col += len;
420
421 if (col > 79)
352 { 422 {
353 len = optList_strlen (i);
354 if (len > 0)
355 len++; /* account for space */
356 }
357#ifdef DEBUG_STRICT
358 assert (optList[i].opt != NULL);
359#endif
360 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0);
361 col += len;
362 if (col > 79)
363 { /* assume regular width */ 423 /* assume regular width */
364 rxvt_log ("\n"); 424 rxvt_log ("\n");
365 col = 1 + len; 425 col = 1 + len;
366 } 426 }
367 427
368 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 428 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
429
369 if (optList_strlen (i)) 430 if (optList[i].arg)
370 rxvt_log (" %s]", optList[i].arg); 431 rxvt_log (" %s]", optList[i].arg);
371 else 432 else
372 rxvt_log ("]"); 433 rxvt_log ("]");
373 } 434 }
374 break; 435 break;
375 436
376 case 1: /* full command-line listing */ 437 case 1: /* full command-line listing */
377 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 438 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
378 439
379 for (i = 0; i < optList_size (); i++) 440 for (i = 0; i < ecb_array_length (optList); i++)
380 if (optList[i].desc != NULL) 441 if (optList[i].desc != NULL)
381 { 442 {
382#ifdef DEBUG_STRICT
383 assert (optList[i].opt != NULL); 443 assert (optList[i].opt != NULL);
384#endif
385 rxvt_log (" %s%s %-*s%s%s\n", 444 rxvt_log (" %s%s %-*s%s%s\n",
386 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 445 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
387 (INDENT - STRLEN (optList[i].opt) 446 (INDENT - strlen (optList[i].opt)
388 + (optList_isBool (i) ? 0 : 2)), 447 + (optList_isBool (i) ? 0 : 2)),
389 (optList[i].arg ? optList[i].arg : ""), 448 (optList[i].arg ? optList[i].arg : ""),
390 (optList_isBool (i) ? "turn on/off " : ""), 449 (optList_isBool (i) ? "turn on/off " : ""),
391 optList[i].desc); 450 optList[i].desc);
392 } 451 }
452
453#if ENABLE_PERL
454 rxvt_perl.init (this);
455 rxvt_perl.usage (this, 1);
456#endif
457
393 rxvt_log ("\n --help to list long-options"); 458 rxvt_log ("\n --help to list long-options");
394 break; 459 break;
395 460
396 case 2: /* full resource listing */ 461 case 2: /* full resource listing */
397 rxvt_log (" [options] [-e command args]\n\n" 462 rxvt_log (" [options] [-e command args]\n\n"
398 "where resources (long-options) include:\n"); 463 "where resources (long-options) include:\n");
399 464
400 for (i = 0; i < optList_size (); i++) 465 for (i = 0; i < ecb_array_length (optList); i++)
401 if (optList[i].kw != NULL) 466 if (optList[i].kw != NULL)
402 rxvt_log (" %s: %*s%s\n", 467 rxvt_log (" %s: %*s%s\n",
403 optList[i].kw, 468 optList[i].kw,
404 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 469 (INDENT - strlen (optList[i].kw)), "", /* XXX */
405 (optList_isBool (i) ? "boolean" : optList[i].arg)); 470 (optList_isBool (i) ? "boolean" : optList[i].arg));
406#ifdef KEYSYM_RESOURCE 471
407 rxvt_log (" " "keysym.sym" ": %*s%s\n", 472#if ENABLE_PERL
408 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 473 rxvt_perl.init (this);
409 "keysym"); 474 rxvt_perl.usage (this, 2);
410#endif 475#endif
476
411 rxvt_log ("\n -help to list options"); 477 rxvt_log ("\n -help to list options");
412 break; 478 break;
413 } 479 }
414 480
415 rxvt_log ("\n\n"); 481 rxvt_log ("\n\n");
416 rxvt_exit_failure (); 482 rxvt_exit_failure ();
417 /* NOTREACHED */
418} 483}
419 484
420/*}}} */ 485/*}}} */
421 486
422/*{{{ get command-line options before getting resources */ 487/*{{{ get command-line options before getting resources */
423void 488const char **
424rxvt_term::get_options (int argc, const char *const *argv) 489rxvt_term::get_options (int argc, const char *const *argv)
425{ 490{
426 int i, bad_option = 0; 491 int i, bad_option = 0;
427 static const char On[3] = "ON", Off[4] = "OFF";
428 492
429 for (i = 1; i < argc; i++) 493 for (i = 1; i < argc; i++)
430 { 494 {
431 unsigned int entry, longopt = 0; 495 unsigned int entry, longopt = 0;
432 const char *flag, *opt; 496 const char *opt;
497 int flag;
433 498
434 opt = argv[i]; 499 opt = argv[i];
435#ifdef DEBUG_RESOURCES 500
436 fprintf (stderr, "argv[%d] = %s: ", i, opt);
437#endif
438 if (*opt == '-') 501 if (*opt == '-')
439 { 502 {
440 flag = On; 503 flag = 1;
504
441 if (*++opt == '-') 505 if (*++opt == '-')
442 longopt = *opt++; /* long option */ 506 longopt = *opt++; /* long option */
443 } 507 }
444 else if (*opt == '+') 508 else if (*opt == '+')
445 { 509 {
446 flag = Off; 510 flag = 0;
511
447 if (*++opt == '+') 512 if (*++opt == '+')
448 longopt = *opt++; /* long option */ 513 longopt = *opt++; /* long option */
449 } 514 }
450 else 515 else
451 { 516 {
452 bad_option = 1; 517 bad_option = 1;
453 rxvt_warn ("\"%s\": malformed option.\n", opt); 518 rxvt_warn ("\"%s\": malformed option.\n", opt);
454 continue; 519 continue;
455 } 520 }
456 521
457 if (!STRCMP (opt, "help")) 522 if (!strcmp (opt, "help"))
458 rxvt_usage (longopt ? 2 : 1); 523 rxvt_usage (longopt ? 2 : 1);
524
459 if (!STRCMP (opt, "h")) 525 if (!strcmp (opt, "h"))
460 rxvt_usage (0); 526 rxvt_usage (0);
461 527
462 /* feature: always try to match long-options */ 528 /* feature: always try to match long-options */
463 for (entry = 0; entry < optList_size (); entry++) 529 for (entry = 0; entry < ecb_array_length (optList); entry++)
464 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 530 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
465 || (!longopt 531 || (!longopt
466 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 532 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
467 break; 533 break;
468 534
469 if (entry < optList_size ()) 535 if (entry < ecb_array_length (optList)
536 && !optList_isInfo (entry))
470 { 537 {
471 if (optList_isReverse (entry)) 538 if (optList_isReverse (entry))
472 flag = flag == On ? Off : On; 539 flag = !flag;
473 540
474 if (optList_strlen (entry)) 541 if (optList_isString (entry))
475 { 542 {
476 /* 543 /*
477 * special cases are handled in main.c:main () to allow 544 * special cases are handled in init_resources () to allow
478 * X resources to set these values before we settle for 545 * X resources to set these values before we settle for
479 * default values 546 * default values
480 */ 547 */
481 548
482 if (optList[entry].doff != -1) 549 if (optList[entry].doff != -1)
550 {
551 if (flag && i+1 == argc)
552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
553
483 rs[optList[entry].doff] = flag == On && argv[i+1] 554 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
484 ? argv[++i] : 0; 555 }
485 } 556 }
486 else 557 else
558 {
487 { /* boolean value */ 559 /* boolean value */
488#ifdef DEBUG_RESOURCES
489 fprintf (stderr, "boolean (%s,%s) = %s\n",
490 optList[entry].opt, optList[entry].kw, flag);
491#endif
492 if (flag == On)
493 Options |= (optList[entry].flag); 560 set_option (optList[entry].index, flag);
494 else
495 Options &= ~ (optList[entry].flag);
496 561
497 if (optList[entry].doff != -1) 562 if (optList[entry].doff != -1)
498 rs[optList[entry].doff] = flag; 563 rs[optList[entry].doff] = flag ? resval_on : resval_off;
499 } 564 }
500 } 565 }
566#ifndef NO_RESOURCES
567 else if (!strcmp (opt, "xrm"))
568 {
569 if (i+1 < argc)
570 XrmPutLineResource (&option_db, argv[++i]);
571 }
572#endif
573#ifdef KEYSYM_RESOURCE
574 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
575 {
576 if (i+1 < argc)
577 {
578 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
579 sprintf (res, "*.%s: %s\n", opt, argv[i]);
580 XrmPutLineResource (&option_db, res);
581 }
582 }
583#endif
584 else if (!strcmp (opt, "e"))
585 {
586 if (i+1 == argc)
587 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
588
589 return (const char **)argv + i + 1;
590 }
501 else 591 else
502#ifdef KEYSYM_RESOURCE 592 {
503 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 593#if ENABLE_PERL
504 if (rxvt_Str_match (opt, "keysym.")) 594 rxvt_perl.init (this);
595
596 if (int flags = rxvt_perl.resource (this, opt, true, longopt, flag, argv [i + 1]))
505 { 597 {
506 const char *str = argv[++i]; 598 if ((!flags & rxvt_perl.RESOURCE_BOOLEAN))
599 {
600 if (flag && i + 1 == argc)
601 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
507 602
508 if (str != NULL) 603 ++i;
509 parse_keysym (opt + sizeof ("keysym.") - 1, str); 604 }
510 } 605 }
511 else 606 else
512#endif 607#endif
513 { 608 {
514 bad_option = 1; 609 bad_option = 1;
515 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 610 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
516 } 611 }
612 }
517 } 613 }
518 614
519 if (bad_option) 615 if (bad_option)
520 rxvt_usage (0); 616 rxvt_usage (0);
617
618 return 0;
521} 619}
522 620
523/*}}} */ 621/*}}} */
524 622
525#ifndef NO_RESOURCES 623#ifndef NO_RESOURCES
… …
530 * Define key from XrmEnumerateDatabase. 628 * Define key from XrmEnumerateDatabase.
531 * quarks will be something like 629 * quarks will be something like
532 * "rxvt" "keysym" "0xFF01" 630 * "rxvt" "keysym" "0xFF01"
533 * value will be a string 631 * value will be a string
534 */ 632 */
535/* ARGSUSED */ 633static int
536int
537rxvt_define_key (XrmDatabase *database __attribute__((unused)), 634rxvt_define_key (XrmDatabase *database ecb_unused,
538 XrmBindingList bindings __attribute__((unused)), 635 XrmBindingList bindings ecb_unused,
539 XrmQuarkList quarks, 636 XrmQuarkList quarks,
540 XrmRepresentation *type __attribute__((unused)), 637 XrmRepresentation *type ecb_unused,
541 XrmValue *value, 638 XrmValue *value,
542 XPointer closure __attribute__((unused))) 639 XPointer closure ecb_unused)
543{ 640{
544 int last; 641 int last;
545 642
546 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 643 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
547 ; 644 ;
645
548 last--; 646 last--;
549 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 647 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
550 return False; 648 return False;
551} 649}
552 650
553/* 651/*
554 * look for something like this (XK_Delete) 652 * look for something like this (XK_Delete)
555 * rxvt*keysym.0xFFFF: "\177" 653 * rxvt*keysym.0xFFFF: "\177"
556 *
557 * arg will be
558 * NULL for ~/.Xdefaults and
559 * non-NULL for command-line options (need to allocate)
560 */ 654 */
561#define NEWARGLIM 500 /* `reasonable' size */ 655
656struct keysym_vocabulary_t
657{
658 const char *name;
659 unsigned short len;
660 unsigned short value;
661};
662static const keysym_vocabulary_t keysym_vocabulary[] =
663{
664 { "ISOLevel3", 9, Level3Mask },
665 { "AppKeypad", 9, AppKeypadMask },
666 { "Control", 7, ControlMask },
667 { "NumLock", 7, NumLockMask },
668 { "Shift", 5, ShiftMask },
669 { "Meta", 4, MetaMask },
670 { "Lock", 4, LockMask },
671 { "Mod1", 4, Mod1Mask },
672 { "Mod2", 4, Mod2Mask },
673 { "Mod3", 4, Mod3Mask },
674 { "Mod4", 4, Mod4Mask },
675 { "Mod5", 4, Mod5Mask },
676 { "I", 1, Level3Mask },
677 { "K", 1, AppKeypadMask },
678 { "C", 1, ControlMask },
679 { "N", 1, NumLockMask },
680 { "S", 1, ShiftMask },
681 { "M", 1, MetaMask },
682 { "A", 1, MetaMask },
683 { "L", 1, LockMask },
684 { "1", 1, Mod1Mask },
685 { "2", 1, Mod2Mask },
686 { "3", 1, Mod3Mask },
687 { "4", 1, Mod4Mask },
688 { "5", 1, Mod5Mask },
689};
690
562int 691int
563rxvt_term::parse_keysym (const char *str, const char *arg) 692rxvt_term::parse_keysym (const char *str, const char *arg)
564{ 693{
565 int n, sym; 694 int sym;
566 char *key_string, *newarg = NULL; 695 unsigned int state = 0;
567 char newargstr[NEWARGLIM]; 696 const char *key = strrchr (str, '-');
568 697
569 if (arg == NULL) 698 if (!key)
699 key = str;
700 else
701 key++;
702
703 // string or key is empty
704 if (*arg == '\0' || *key == '\0')
705 return -1;
706
707 // parse modifiers
708 while (str < key)
570 { 709 {
571 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 710 unsigned int i;
711
712 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
713 {
714 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
715 {
716 state |= keysym_vocabulary[i].value;
717 str += keysym_vocabulary[i].len;
718 break;
719 }
720 }
721
722 if (i >= ecb_array_length (keysym_vocabulary))
572 return 0; 723 return -1;
573 str += n; /* skip `keysym.' */ 724
725 if (*str == '-')
726 ++str;
574 } 727 }
575 /* some scanf () have trouble with a 0x prefix */ 728
576 if (isdigit (str[0])) 729 // convert keysym name to keysym number
730 if ((sym = XStringToKeysym (str)) == None)
577 { 731 {
578 if (str[0] == '0' && toupper (str[1]) == 'X') 732 // fallback on hexadecimal parsing
579 str += 2; 733 char *end;
734 sym = strtol (str, &end, 16);
580 if (arg) 735 if (*end)
581 {
582 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1)
583 return -1;
584 }
585 else
586 {
587 if (sscanf (str, "%x:", &sym) != 1)
588 return -1;
589
590 /* cue to ':', it's there since sscanf () worked */
591 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1);
592 newargstr[NEWARGLIM - 1] = '\0';
593 newarg = newargstr;
594 }
595 }
596 else
597 {
598 /*
599 * convert keysym name to keysym number
600 */
601 STRNCPY (newargstr, str, NEWARGLIM - 1);
602 newargstr[NEWARGLIM - 1] = '\0';
603 if (arg == NULL)
604 {
605 if ((newarg = STRCHR (newargstr, ':')) == NULL)
606 return -1;
607 *newarg++ = '\0'; /* terminate keysym name */
608 }
609 if ((sym = XStringToKeysym (newargstr)) == None)
610 return -1; 736 return -1;
611 } 737 }
612 738
613 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */ 739 wchar_t *ws = rxvt_mbstowcs (arg);
614 return -1; 740 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
615 sym &= 0xFF; 741 keyboard->register_user_translation (sym, state, ws);
616 if (Keysym_map[sym] != NULL) /* already set ? */ 742 free (ws);
617 return -1;
618
619 if (newarg == NULL)
620 {
621 STRNCPY (newargstr, arg, NEWARGLIM - 1);
622 newargstr[NEWARGLIM - 1] = '\0';
623 newarg = newargstr;
624 }
625 rxvt_Str_trim (newarg);
626 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
627 return -1;
628 MIN_IT (n, 255);
629 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
630
631 key_string[0] = n;
632 STRNCPY (key_string + 1, newarg, n);
633 Keysym_map[sym] = (unsigned char *)key_string;
634
635 return 1; 743 return 1;
636} 744}
637 745
638# endif /* KEYSYM_RESOURCE */ 746# endif /* KEYSYM_RESOURCE */
747#endif /* NO_RESOURCES */
639 748
640# ifndef USE_XGETDEFAULT 749static char *
641/*{{{ rxvt_get_xdefaults () */ 750get_res (XrmDatabase database, const char *program, const char *option)
642/* 751{
643 * the matching algorithm used for memory-save fake resources 752 char resource[512];
644 */ 753 char *type;
754 XrmValue result;
755
756 snprintf (resource, sizeof (resource), "%s.%s", program, option);
757 XrmGetResource (database, resource, resource, &type, &result);
758
759 return result.addr;
760}
761
762const char *
763rxvt_term::x_resource (const char *name)
764{
765 XrmDatabase database = XrmGetDatabase (dpy);
766
767 const char *p = get_res (database, rs[Rs_name], name);
768 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
769
770 if (p == NULL || (p0 && strcmp (p, p0) == 0))
771 {
772 p = get_res (database, RESCLASS, name);
773#ifdef RESFALLBACK
774 if (p == NULL || (p0 && strcmp (p, p0) == 0))
775 p = get_res (database, RESFALLBACK, name);
776#endif
777 }
778
779 if (p == NULL && p0)
780 p = p0;
781
782 return p;
783}
784
645void 785void
646rxvt_term::get_xdefaults (FILE *stream, const char *name) 786rxvt_term::extract_resources ()
647{ 787{
648 unsigned int len; 788#ifndef NO_RESOURCES
649 char *str, buffer[256]; 789 XrmDatabase database = XrmGetDatabase (dpy);
650 790 XrmMergeDatabases (option_db, &database);
651 if (stream == NULL) 791 option_db = NULL;
652 return; 792 /*
653 793 * Query resources for options that affect us
654 len = STRLEN (name); 794 */
655 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 795 for (int entry = 0; entry < ecb_array_length (optList); entry++)
656 { 796 {
657 unsigned int entry, n;
658
659 while (*str && isspace (*str))
660 str++; /* leading whitespace */
661
662 if ((str[len] != '*' && str[len] != '.')
663 || (len && STRNCMP (str, name, len)))
664 continue;
665 str += (len + 1); /* skip `name*' or `name.' */
666
667# ifdef KEYSYM_RESOURCE
668 if (!parse_keysym (str, NULL))
669# endif /* KEYSYM_RESOURCE */
670 for (entry = 0; entry < optList_size (); entry++)
671 {
672 const char *kw = optList[entry].kw; 797 const char *kw = optList[entry].kw;
673 798
674 if (kw == NULL) 799 if (kw == NULL || rs[optList[entry].doff] != NULL)
675 continue; 800 continue; // previously set
676 801
677 n = STRLEN (kw); 802 const char *p = x_resource (kw);
678 if (str[n] == ':' && rxvt_Str_match (str, kw)) 803
804 if (p)
805 {
806 p = strdup (p);
807 allocated.push_back ((void *)p);
808 rs[optList[entry].doff] = p;
809
810 if (optList_isBool (entry))
679 { 811 {
680 /* skip `keyword:' */ 812 bool s = parse_bool_resource (p);
681 str += n + 1;
682 rxvt_Str_trim (str);
683 n = STRLEN (str);
684 if (n && rs[optList[entry].doff] == NULL)
685 {
686 /* not already set */
687 int s;
688 char *p = 0;
689 813
690 for (int o = 0;;)
691 {
692 p = (char *)rxvt_realloc (p, o + n + 1);
693 MEMCPY (p + o, str, n);
694 o += n;
695 p[o] = 0;
696
697 if (o == 0 || p[o - 1] != '\\') // continuation line
698 break;
699
700 o--; // eat "\"
701
702 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
703 break;
704
705 rxvt_Str_trim (str);
706 n = STRLEN (str);
707 }
708
709 rs[optList[entry].doff] = p;
710 allocated.push_back (p);
711
712 if (optList_isBool (entry))
713 {
714 s = STRCASECMP (str, "TRUE") == 0
715 || STRCASECMP (str, "YES") == 0
716 || STRCASECMP (str, "ON") == 0
717 || STRCASECMP (str, "1") == 0;
718
719 if (optList_isReverse (entry)) 814 if (optList_isReverse (entry))
720 s = !s; 815 s = !s;
721 816
722 if (s) 817 set_option (optList[entry].index, s);
723 Options |= optList[entry].flag;
724 else
725 Options &= ~optList[entry].flag;
726 }
727 }
728
729 break;
730 } 818 }
731 } 819 }
732 } 820 }
733 821#endif /* NO_RESOURCES */
734 rewind (stream);
735} 822}
736 823
737/*}}} */
738# endif /* ! USE_XGETDEFAULT */
739#endif /* NO_RESOURCES */
740
741/*{{{ read the resources files */
742/*
743 * using XGetDefault () or the hand-rolled replacement
744 */
745/* ARGSUSED */
746void 824void
747rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) 825rxvt_term::extract_keysym_resources ()
748{ 826{
749#ifndef NO_RESOURCES 827#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
750 828 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
751# if defined XAPPLOADDIR
752# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
753 /* Compute the path of the possibly available localized Rxvt file */
754 char *localepath = NULL;
755
756 if (locale != NULL)
757 { /* XXX: must limit length of string */
758 localepath = (char *)rxvt_malloc (256);
759 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
760 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
761 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
762 }
763
764 {
765# endif
766# endif 829#endif
830}
767 831
768# ifdef USE_XGETDEFAULT 832#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
833void
834rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
835 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
836{
769 /* 837 /*
770 * get resources using the X library function 838 * [R5 or later]: enumerate the resource database
771 */ 839 */
772 int entry; 840 XrmDatabase database = XrmGetDatabase (dpy);
773
774# ifdef XrmEnumOneLevel
775 int i;
776 char *displayResource, *xe;
777 XrmName name_prefix[3]; 841 XrmName name_prefix[3];
778 XrmClass class_prefix[3]; 842 XrmClass class_prefix[3];
779 XrmDatabase database, rdb1;
780 char fname[1024];
781 843
782 XrmInitialize (); 844 name_prefix[0] = XrmStringToName (rs[Rs_name]);
783 database = NULL; 845 name_prefix[1] = XrmStringToName (n_prefix);
784 846 name_prefix[2] = NULLQUARK;
785 /* Get any Xserver defaults */ 847 class_prefix[0] = XrmStringToName (RESCLASS);
786 848 class_prefix[1] = XrmStringToName (c_prefix);
787 displayResource = XResourceManagerString (display); 849 class_prefix[2] = NULLQUARK;
788 if (displayResource != NULL) 850 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
789 database = XrmGetStringDatabase (displayResource); 851 XrmEnumerateDatabase (database, name_prefix, class_prefix,
790 852 mode, proc, NULL);
791# ifdef HAVE_EXTRA_XRESOURCE_FILES 853# ifdef RESFALLBACK
792 /* Add in ~/.Xdefaults or ~/.Xresources */ 854 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
793 { 855 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
794 char *ptr; 856 XrmEnumerateDatabase (database, name_prefix, class_prefix,
795 857 mode, proc, NULL);
796 if ((ptr = (char *)getenv ("HOME")) == NULL)
797 ptr = ".";
798
799 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
800 {
801 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2,
802 ptr, xnames[i]);
803 if ((rdb1 = XrmGetFileDatabase (fname)))
804 {
805 XrmMergeDatabases (rdb1, &database);
806# ifndef HAVE_BOTH_XRESOURCE_FILES
807 break;
808# endif
809
810 }
811 }
812 }
813# endif 858# endif
814
815 /* Add in XENVIRONMENT file */
816
817 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
818 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
819 XrmMergeDatabases (rdb1, &database);
820
821 /* Add in Rxvt file */
822# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
823 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
824# endif
825 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
826
827 if (rdb1 != NULL)
828 XrmMergeDatabases (rdb1, &database);
829
830 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
831 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
832 {
833 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
834 - sizeof (RESCLASS) - 2, xe);
835 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
836 XrmMergeDatabases (rdb1, &database);
837 }
838
839 XrmSetDatabase (display, database);
840# endif
841
842 /*
843 * Query resources for options that affect us
844 */
845 for (entry = 0; entry < optList_size (); entry++)
846 {
847 int s;
848 char *p, *p0;
849 const char *kw = optList[entry].kw;
850
851 if (kw == NULL || rs[optList[entry].doff] != NULL)
852 continue; /* previously set */
853
854 p = XGetDefault (display, name, kw);
855 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
856 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
857 {
858 p = XGetDefault (display, RESCLASS, kw);
859#ifdef RESFALLBACK
860 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
861 p = XGetDefault (display, RESFALLBACK, kw);
862#endif
863 }
864
865 if (p == NULL && p0)
866 p = p0;
867
868 if (p)
869 {
870 rs[optList[entry].doff] = p;
871
872 if (optList_isBool (entry))
873 {
874 s = STRCASECMP (p, "TRUE") == 0
875 || STRCASECMP (p, "YES") == 0
876 || STRCASECMP (p, "ON") == 0
877 || STRCASECMP (p, "1") == 0;
878 if (optList_isReverse (entry))
879 s = !s;
880 if (s)
881 Options |= (optList[entry].flag);
882 else
883 Options &= ~ (optList[entry].flag);
884 }
885 }
886 }
887
888 /*
889 * [R5 or later]: enumerate the resource database
890 */
891# ifdef XrmEnumOneLevel
892# ifdef KEYSYM_RESOURCE
893 name_prefix[0] = XrmStringToName (name);
894 name_prefix[1] = XrmStringToName ("keysym");
895 name_prefix[2] = NULLQUARK;
896 class_prefix[0] = XrmStringToName (RESCLASS);
897 class_prefix[1] = XrmStringToName ("Keysym");
898 class_prefix[2] = NULLQUARK;
899 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
900 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
901 XrmEnumOneLevel, rxvt_define_key, NULL);
902# ifdef RESFALLBACK
903 name_prefix[0] = XrmStringToName (RESFALLBACK);
904 name_prefix[1] = XrmStringToName ("keysym");
905 class_prefix[0] = XrmStringToName (RESFALLBACK);
906 class_prefix[1] = XrmStringToName ("Keysym");
907 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
908 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
909 XrmEnumOneLevel, rxvt_define_key, NULL);
910# endif
911# endif
912# endif
913
914# else /* USE_XGETDEFAULT */
915 /* get resources the hard way, but save lots of memory */
916 FILE *fd = NULL;
917 char *home;
918
919 if ((home = getenv ("HOME")) != NULL)
920 {
921 unsigned int i, len = STRLEN (home) + 2;
922 char *f = NULL;
923
924 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
925 {
926 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char));
927
928 sprintf (f, "%s/%s", home, xnames[i]);
929
930 if ((fd = fopen (f, "r")) != NULL)
931 break;
932 }
933 free (f);
934 }
935 /*
936 * The normal order to match resources is the following:
937 * @ global resources (partial match, ~/.Xdefaults)
938 * @ application file resources (XAPPLOADDIR/Rxvt)
939 * @ class resources (~/.Xdefaults)
940 * @ private resources (~/.Xdefaults)
941 *
942 * However, for the hand-rolled resources, the matching algorithm
943 * checks if a resource string value has already been allocated
944 * and won't overwrite it with (in this case) a less specific
945 * resource value.
946 *
947 * This avoids multiple allocation. Also, when we've called this
948 * routine command-line string options have already been applied so we
949 * needn't to allocate for those resources.
950 *
951 * So, search in resources from most to least specific.
952 *
953 * Also, use a special sub-class so that we can use either or both of
954 * "XTerm" and "Rxvt" as class names.
955 */
956
957 get_xdefaults (fd, name);
958 get_xdefaults (fd, RESCLASS);
959# ifdef RESFALLBACK
960 get_xdefaults (fd, RESFALLBACK);
961# endif
962
963# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
964 {
965 FILE *ad = NULL;
966
967# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
968 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
969# endif
970 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
971 if (ad != NULL)
972 {
973 get_xdefaults (ad, RESCLASS);
974 get_xdefaults (ad, "");
975 fclose (ad);
976 }
977 }
978# endif /* XAPPLOADDIR */
979
980 get_xdefaults (fd, ""); /* partial match */
981 if (fd != NULL)
982 fclose (fd);
983# endif /* USE_XGETDEFAULT */
984
985# if defined XAPPLOADDIR
986# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
987
988 }
989
990 /* Free the path of the possibly available localized Rxvt file */
991 free (localepath);
992# endif
993# endif
994
995#endif /* NO_RESOURCES */
996} 859}
860#endif
997 861
998/*}}} */
999/*----------------------- end-of-file (C source) -----------------------*/ 862/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines