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.56 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.166 by root, Tue Jun 5 19:32:29 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 30
34#include <sys/utsname.h>
35
36#ifdef KEYSYM_RESOURCE 31#ifdef KEYSYM_RESOURCE
37#include "keyboard.h" 32# include "keyboard.h"
38#endif 33#endif
39 34
40/* #define DEBUG_RESOURCES */ 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
41 40
42/*{{{ monolithic option/resource structure: */ 41/* monolithic option/resource structure: */
43/* 42/*
44 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
45 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
46 * 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 ()
47 */ 46 */
48 47
49/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
50#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
51 {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}
52 54
53/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
54#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
55 {0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
56 58
57/* RSTRG () - resource/long-option */ 59/* RSTRG () - resource/long-option */
58#define RSTRG(rsp, kw, arg) \ 60#define RSTRG(rsp, kw, arg) \
59 {0, (rsp), (kw), NULL, (arg), NULL} 61 {0, 0, (rsp), (kw), NULL, (arg), NULL}
60 62
61/* BOOL () - regular boolean `-/+' flag */ 63/* BOOL () - regular boolean `-/+' flag */
62#define BOOL(rsp, kw, opt, flag, desc) \ 64#define BOOL(rsp, kw, opt, option, flag, desc) \
63 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} 65 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
64 66
65/* SWCH () - `-' flag */ 67/* SWCH () - `-' flag */
66#define SWCH(opt, flag, desc) \ 68#define SWCH(opt, option, flag, desc) \
67 { (flag), -1, NULL, (opt), NULL, (desc)} 69 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
68 70
69/* convenient macros */ 71/* convenient macros */
70#define optList_strlen(i) \ 72#define optList_isString(i) \
71 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 73 (optList[i].flag == 0)
72#define optList_isBool(i) \ 74#define optList_isBool(i) \
73 (optList[i].flag & Opt_Boolean) 75 (optList[i].flag & Optflag_Boolean)
74#define optList_isReverse(i) \ 76#define optList_isReverse(i) \
75 (optList[i].flag & Opt_Reverse) 77 (optList[i].flag & Optflag_Reverse)
76#define optList_size \ 78#define optList_isInfo(i) \
77 (sizeof (optList) / sizeof (optList[0])) 79 (optList[i].flag & Optflag_Info)
78 80
79static const struct 81static const struct
80 { 82 {
83 const uint8_t index; /* Option index */
81 const unsigned long flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
82 const int doff; /* data offset */ 85 const int16_t doff; /* resource value index or -1 */
83 const char *kw; /* keyword */ 86 const char *kw; /* keyword */
84 const char *opt; /* option */ 87 const char *opt; /* option */
85 const char *arg; /* argument */ 88 const char *arg; /* argument */
86 const char *desc; /* description */ 89 const char *desc; /* description */
87 } 90 }
… …
89 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 92 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
90 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 93 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
91 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"),
92 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 95 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
93 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
94 SWCH ("C", Opt_console, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
95 SWCH ("iconic", Opt_iconic, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
96 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"),
97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 102 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
101#ifdef HAVE_SCROLLBARS
102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 106 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 107 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
104 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"),
105 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"),
106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 110 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
108#endif
109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
110 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"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
113#ifdef TRANSPARENT 116#if ENABLE_TRANSPARENCY
114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
115 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"),
116 SWCH ("tr", Opt_transparent, NULL),
117#if TINTING
118 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"),
119#endif 122#endif
120#endif
121#ifdef OFF_FOCUS_FADING 123#if OFF_FOCUS_FADING
122 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode 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"),
123#endif 126#endif
124#ifdef TINTING
125 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
126#endif
127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
128#ifndef NO_BELL 128#ifndef NO_BELL
129# if ENABLE_FRILLS
130 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
131# endif
129 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 132 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
130# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 133# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
131 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 134 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
132# endif 135# endif
133#endif 136#endif
134#ifdef META8_OPTION 137#ifdef META8_OPTION
135 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 138 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
136#endif 139#endif
137#ifdef MOUSE_WHEEL 140#ifdef MOUSE_WHEEL
138 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 141 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
139#endif 142#endif
140#if ENABLE_FRILLS 143#if ENABLE_FRILLS
141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 144 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
142 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"),
143#endif 147#endif
144#ifdef CURSOR_BLINK 148#if CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 149 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
146#endif 150#endif
147#ifdef POINTER_BLANK 151#ifdef POINTER_BLANK
148 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"),
149#endif 153#endif
150 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 154 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
151 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 155 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
152 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 156 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
153 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 157 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
155 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 159 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
156 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 160 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
157 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 161 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
158 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 162 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
159 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 163 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
160#ifndef NO_BRIGHTCOLOR
161 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
162 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
163 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
164 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
165 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 168 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
166 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 169 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
167 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 170 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 171 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
169#endif /* NO_BRIGHTCOLOR */
170#ifndef NO_BOLD_UNDERLINE_REVERSE 172#ifndef NO_BOLD_UNDERLINE_REVERSE
171 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 173 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
172 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 174 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
173 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 175 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
174 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 176 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
175#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 177#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
176#if ENABLE_FRILLS 178#if ENABLE_FRILLS
177 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 179 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
178#endif 180#endif
179#ifdef KEEP_SCROLLCOLOR
180 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 181 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
182#ifdef RXVT_SCROLLBAR
181 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
182#endif /* KEEP_SCROLLCOLOR */ 184#endif
183#ifdef OPTION_HC 185#ifdef OPTION_HC
184 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"),
185#endif 188#endif
186#ifndef NO_CURSORCOLOR 189#ifndef NO_CURSORCOLOR
187 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 190 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
188 /* command-line option = resource name */ 191 /* command-line option = resource name */
189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
190#endif /* NO_CURSORCOLOR */ 193#endif /* NO_CURSORCOLOR */
191 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
192 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
194#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 197#if BG_IMAGE_FROM_FILE
195 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
196#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
197#ifdef XPM_BACKGROUND
198 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
199#endif /* XPM_BACKGROUND */ 200# if ENABLE_EWMH
200#if (MENUBAR_MAX) 201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
201 RSTRG (Rs_menu, "menu", "name[;tag]"), 202# endif
202#endif 203#endif
203 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
204 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
205#if ENABLE_STYLES 206#if ENABLE_STYLES
206 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
207 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
208 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold 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"),
209#endif 211#endif
210#ifdef USE_XIM 212#if USE_XIM
211 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
212 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"),
213 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"),
214 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 216 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
215#endif /* USE_XIM */ 217#endif /* USE_XIM */
216 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"),
217 STRG (Rs_title, "title", "title", "string", "title name for window"), 219 STRG (Rs_title, "title", "title", "string", "title name for window"),
218 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 220 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
219 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 221 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
220 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"),
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
221#if ENABLE_FRILLS 230#if ENABLE_FRILLS
222 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 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"),
223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 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"),
224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 235 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 236 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 237 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 238 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 239 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
229 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"),
242#endif
243#ifdef BUILTIN_GLYPHS
244 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
230#endif 245#endif
231#ifdef POINTER_BLANK 246#ifdef POINTER_BLANK
232 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 247 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
233#endif 248#endif
234#ifndef NO_BACKSPACE_KEY 249#ifndef NO_BACKSPACE_KEY
235 RSTRG (Rs_backspace_key, "backspacekey", "string"), 250 RSTRG (Rs_backspace_key, "backspacekey", "string"),
236#endif 251#endif
237#ifndef NO_DELETE_KEY 252#ifndef NO_DELETE_KEY
238 RSTRG (Rs_delete_key, "deletekey", "string"), 253 RSTRG (Rs_delete_key, "deletekey", "string"),
239#endif 254#endif
240 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
241#ifdef PRINTPIPE 255#ifdef PRINTPIPE
242 RSTRG (Rs_print_pipe, "print-pipe", "string"), 256 RSTRG (Rs_print_pipe, "print-pipe", "string"),
243#endif 257#endif
244 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"),
245#ifdef CUTCHAR_RESOURCE
246 RSTRG (Rs_cutchars, "cutchars", "string"), 259 RSTRG (Rs_cutchars, "cutchars", "string"),
247#endif /* CUTCHAR_RESOURCE */
248 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 260 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
249#ifndef NO_SECONDARY_SCREEN 261#ifndef NO_SECONDARY_SCREEN
250 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 262 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
251 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 263 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
252#endif 264#endif
253#if 0 && TODO 265#if ENABLE_PERL
254#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) 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
255 INFO ("xrm", "string", "X resource"), 276 RINFO ("xrm", "string"),
256#endif 277#endif
278#ifdef KEYSYM_RESOURCE
279 RINFO ("keysym.sym", "keysym"),
257#endif 280#endif
258 INFO ("e", "command arg ...", "command to execute") 281 INFO ("e", "command arg ...", "command to execute")
259 }; 282 };
260 283
261#undef INFO 284#undef INFO
285#undef RINFO
262#undef STRG 286#undef STRG
263#undef RSTRG 287#undef RSTRG
264#undef SWCH 288#undef SWCH
265#undef BOOL 289#undef BOOL
266/*}}} */
267 290
268static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 291static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
269static const char optionsstring[] = "options: " 292static const char optionsstring[] = "options: "
293#if ENABLE_PERL
294 "perl,"
295#endif
270#if XFT 296#if XFT
271 "xft," 297 "xft,"
272#endif 298#endif
273#if ENABLE_STYLES 299#if ENABLE_STYLES
274 "styles," 300 "styles,"
… …
303#endif 329#endif
304 "," 330 ","
305#if OFF_FOCUS_FADING 331#if OFF_FOCUS_FADING
306 "fade," 332 "fade,"
307#endif 333#endif
308#if defined(XPM_BACKGROUND)
309 "XPM,"
310#endif
311#if defined(TRANSPARENT) 334#if defined(ENABLE_TRANSPARENCY)
312 "transparent," 335 "transparent,"
313#endif
314#if TINTING
315 "tint," 336 "tint,"
316#endif 337#endif
317#if defined(UTMP_SUPPORT) 338#if HAVE_PIXBUF
318 "utmp," 339 "pixbuf,"
319#endif
320#if defined(MENUBAR)
321 "menubar,"
322#endif 340#endif
323#if defined(USE_XIM) 341#if defined(USE_XIM)
324 "XIM," 342 "XIM,"
325#endif 343#endif
326 "scrollbars="
327#if !defined(HAVE_SCROLLBARS)
328 "NONE"
329#else
330# if defined(PLAIN_SCROLLBAR)
331 "plain"
332# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
333 "+"
334# endif
335# endif
336# if defined(RXVT_SCROLLBAR)
337 "rxvt"
338# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
339 "+"
340# endif
341# endif
342# if defined(NEXT_SCROLLBAR)
343 "NeXT"
344# if defined(XTERM_SCROLLBAR)
345 "+"
346# endif
347# endif
348# if defined(XTERM_SCROLLBAR)
349 "xterm"
350# endif
351#endif
352 ","
353#if defined(NO_BACKSPACE_KEY) 344#if defined(NO_BACKSPACE_KEY)
354 "no_backspace," 345 "no_backspace,"
355#endif 346#endif
356#if defined(NO_DELETE_KEY) 347#if defined(NO_DELETE_KEY)
357 "no_delete," 348 "no_delete,"
358#endif 349#endif
359#if EIGHT_BIT_CONTROLS 350#if EIGHT_BIT_CONTROLS
360 "8bitctrls," 351 "8bitctrls,"
361#endif 352#endif
362#if !defined(NO_STRINGS)
363 "strings,"
364#endif
365#if defined(ENABLE_FRILLS) 353#if defined(ENABLE_FRILLS)
366 "frills," 354 "frills,"
367#endif 355#endif
368#if defined(PREFER_24BIT)
369 "24bit,"
370#endif
371#if defined(SELECTION_SCROLLING) 356#if defined(SELECTION_SCROLLING)
372 "selectionscrolling," 357 "selectionscrolling,"
373#endif 358#endif
374#if MOUSE_WHEEL 359#if MOUSE_WHEEL
375 "wheel," 360 "wheel,"
… …
385#endif 370#endif
386#if defined(POINTER_BLANK) 371#if defined(POINTER_BLANK)
387 "pointerBlank," 372 "pointerBlank,"
388#endif 373#endif
389#if defined(NO_RESOURCES) 374#if defined(NO_RESOURCES)
390 "NoResources" 375 "NoResources,"
391#else
392# if defined(USE_XGETDEFAULT)
393 "XGetDefaults"
394# else
395 ".Xdefaults"
396# 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"
397#endif 386#endif
398 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
399 388
400#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";
401 394
402/*{{{ usage: */ 395/*{{{ usage: */
403/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
404static void 397void
405rxvt_usage (int type) 398rxvt_term::rxvt_usage (int type)
406{ 399{
407 unsigned int i, col; 400 unsigned int i, col;
408 401
409 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 402 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
410 403
411 switch (type) 404 switch (type)
412 { 405 {
413 case 0: /* brief listing */ 406 case 0: /* brief listing */
414 rxvt_log (" [-help] [--help]\n"); 407 rxvt_log (" [-help] [--help]\n");
415 408
416 for (col = 1, i = 0; i < optList_size; i++) 409 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
417 if (optList[i].desc != NULL) 410 if (optList[i].desc != NULL)
418 { 411 {
419 int len = 0; 412 int len = 0;
420 413
421 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)
422 { 422 {
423 len = optList_strlen (i);
424 if (len > 0)
425 len++; /* account for space */
426 }
427#ifdef DEBUG_STRICT
428 assert (optList[i].opt != NULL);
429#endif
430 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
431 col += len;
432 if (col > 79)
433 { /* assume regular width */ 423 /* assume regular width */
434 rxvt_log ("\n"); 424 rxvt_log ("\n");
435 col = 1 + len; 425 col = 1 + len;
436 } 426 }
437 427
438 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 428 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
429
439 if (optList_strlen (i)) 430 if (optList[i].arg)
440 rxvt_log (" %s]", optList[i].arg); 431 rxvt_log (" %s]", optList[i].arg);
441 else 432 else
442 rxvt_log ("]"); 433 rxvt_log ("]");
443 } 434 }
444 break; 435 break;
445 436
446 case 1: /* full command-line listing */ 437 case 1: /* full command-line listing */
447 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 438 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
448 439
449 for (i = 0; i < optList_size; i++) 440 for (i = 0; i < ecb_array_length (optList); i++)
450 if (optList[i].desc != NULL) 441 if (optList[i].desc != NULL)
451 { 442 {
452#ifdef DEBUG_STRICT
453 assert (optList[i].opt != NULL); 443 assert (optList[i].opt != NULL);
454#endif
455 rxvt_log (" %s%s %-*s%s%s\n", 444 rxvt_log (" %s%s %-*s%s%s\n",
456 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 445 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
457 (INDENT - strlen (optList[i].opt) 446 (INDENT - strlen (optList[i].opt)
458 + (optList_isBool (i) ? 0 : 2)), 447 + (optList_isBool (i) ? 0 : 2)),
459 (optList[i].arg ? optList[i].arg : ""), 448 (optList[i].arg ? optList[i].arg : ""),
… …
465 454
466 case 2: /* full resource listing */ 455 case 2: /* full resource listing */
467 rxvt_log (" [options] [-e command args]\n\n" 456 rxvt_log (" [options] [-e command args]\n\n"
468 "where resources (long-options) include:\n"); 457 "where resources (long-options) include:\n");
469 458
470 for (i = 0; i < optList_size; i++) 459 for (i = 0; i < ecb_array_length (optList); i++)
471 if (optList[i].kw != NULL) 460 if (optList[i].kw != NULL)
472 rxvt_log (" %s: %*s%s\n", 461 rxvt_log (" %s: %*s%s\n",
473 optList[i].kw, 462 optList[i].kw,
474 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 463 (INDENT - strlen (optList[i].kw)), "", /* XXX */
475 (optList_isBool (i) ? "boolean" : optList[i].arg)); 464 (optList_isBool (i) ? "boolean" : optList[i].arg));
476#ifdef KEYSYM_RESOURCE
477 rxvt_log (" " "keysym.sym" ": %*s%s\n",
478 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
479 "keysym");
480#endif
481 rxvt_log ("\n -help to list options"); 465 rxvt_log ("\n -help to list options");
482 break; 466 break;
483 } 467 }
484 468
469#if ENABLE_PERL
470 if (type) // do not initialise perl for type == 0, as perl does not have "short" options
471 {
472 rxvt_perl.init (this);
473 rxvt_perl.usage (type);
474 }
475#endif
476
485 rxvt_log ("\n\n"); 477 rxvt_log ("\n\n");
486 rxvt_exit_failure (); 478 rxvt_exit_failure ();
487 /* NOTREACHED */
488} 479}
489 480
490/*}}} */ 481/*}}} */
491 482
492/*{{{ get command-line options before getting resources */ 483/*{{{ get command-line options before getting resources */
493void 484const char **
494rxvt_term::get_options (int argc, const char *const *argv) 485rxvt_term::get_options (int argc, const char *const *argv)
495{ 486{
496 int i, bad_option = 0; 487 int i, bad_option = 0;
497 static const char On[3] = "ON", Off[4] = "OFF";
498 488
499 for (i = 1; i < argc; i++) 489 for (i = 1; i < argc; i++)
500 { 490 {
501 unsigned int entry, longopt = 0; 491 unsigned int entry, longopt = 0;
502 const char *flag, *opt; 492 const char *opt;
493 int flag;
503 494
504 opt = argv[i]; 495 opt = argv[i];
505#ifdef DEBUG_RESOURCES 496
506 fprintf (stderr, "argv[%d] = %s: ", i, opt);
507#endif
508 if (*opt == '-') 497 if (*opt == '-')
509 { 498 {
510 flag = On; 499 flag = 1;
500
511 if (*++opt == '-') 501 if (*++opt == '-')
512 longopt = *opt++; /* long option */ 502 longopt = *opt++; /* long option */
513 } 503 }
514 else if (*opt == '+') 504 else if (*opt == '+')
515 { 505 {
516 flag = Off; 506 flag = 0;
507
517 if (*++opt == '+') 508 if (*++opt == '+')
518 longopt = *opt++; /* long option */ 509 longopt = *opt++; /* long option */
519 } 510 }
520 else 511 else
521 { 512 {
… …
524 continue; 515 continue;
525 } 516 }
526 517
527 if (!strcmp (opt, "help")) 518 if (!strcmp (opt, "help"))
528 rxvt_usage (longopt ? 2 : 1); 519 rxvt_usage (longopt ? 2 : 1);
520
529 if (!strcmp (opt, "h")) 521 if (!strcmp (opt, "h"))
530 rxvt_usage (0); 522 rxvt_usage (0);
531 523
532 /* feature: always try to match long-options */ 524 /* feature: always try to match long-options */
533 for (entry = 0; entry < optList_size; entry++) 525 for (entry = 0; entry < ecb_array_length (optList); entry++)
534 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 526 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
535 || (!longopt 527 || (!longopt
536 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 528 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
537 break; 529 break;
538 530
539 if (entry < optList_size) 531 if (entry < ecb_array_length (optList)
532 && !optList_isInfo (entry))
540 { 533 {
541 if (optList_isReverse (entry)) 534 if (optList_isReverse (entry))
542 flag = flag == On ? Off : On; 535 flag = !flag;
543 536
544 if (optList_strlen (entry)) 537 if (optList_isString (entry))
545 { 538 {
546 /* 539 /*
547 * special cases are handled in main.c:main () to allow 540 * special cases are handled in init_resources () to allow
548 * X resources to set these values before we settle for 541 * X resources to set these values before we settle for
549 * default values 542 * default values
550 */ 543 */
551 544
552 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
546 {
547 if (flag && i+1 == argc)
548 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
549
553 rs[optList[entry].doff] = flag == On && argv[i+1] 550 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
554 ? argv[++i] : 0; 551 }
555 } 552 }
556 else 553 else
554 {
557 { /* boolean value */ 555 /* boolean value */
558#ifdef DEBUG_RESOURCES
559 fprintf (stderr, "boolean (%s,%s) = %s\n",
560 optList[entry].opt, optList[entry].kw, flag);
561#endif
562 if (flag == On)
563 options |= optList[entry].flag; 556 set_option (optList[entry].index, flag);
564 else
565 options &= ~optList[entry].flag;
566 557
567 if (optList[entry].doff != -1) 558 if (optList[entry].doff != -1)
568 rs[optList[entry].doff] = flag; 559 rs[optList[entry].doff] = flag ? resval_on : resval_off;
569 } 560 }
570 } 561 }
562#ifndef NO_RESOURCES
563 else if (!strcmp (opt, "xrm"))
564 {
565 if (i+1 < argc)
566 XrmPutLineResource (&option_db, argv[++i]);
567 }
568#endif
569#ifdef KEYSYM_RESOURCE
570 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
571 {
572 if (i+1 < argc)
573 {
574 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
575 sprintf (res, "*.%s: %s\n", opt, argv[i]);
576 XrmPutLineResource (&option_db, res);
577 }
578 }
579#endif
580 else if (!strcmp (opt, "e"))
581 {
582 if (i+1 == argc)
583 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
584
585 return (const char **)argv + i + 1;
586 }
571 else 587 else
572#ifdef KEYSYM_RESOURCE 588 {
573 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ 589#if ENABLE_PERL
574 if (rxvt_Str_match (opt, "keysym.")) 590 rxvt_perl.init (this);
591
592 if (int flags = rxvt_perl.resource (this, opt, true, longopt, flag, argv [i + 1]))
575 { 593 {
576 const char *str = argv[++i]; 594 if ((!flags & rxvt_perl.RESOURCE_BOOLEAN))
595 {
596 if (flag && i + 1 == argc)
597 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
577 598
578 if (str != NULL) 599 ++i;
579 parse_keysym (opt + sizeof ("keysym.") - 1, str); 600 }
580 } 601 }
581 else 602 else
582#endif 603#endif
583 { 604 {
584 bad_option = 1; 605 bad_option = 1;
585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 606 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
586 } 607 }
608 }
587 } 609 }
588 610
589 if (bad_option) 611 if (bad_option)
590 rxvt_usage (0); 612 rxvt_usage (0);
613
614 return 0;
591} 615}
592 616
593/*}}} */ 617/*}}} */
594 618
595#ifndef NO_RESOURCES 619#ifndef NO_RESOURCES
… …
600 * Define key from XrmEnumerateDatabase. 624 * Define key from XrmEnumerateDatabase.
601 * quarks will be something like 625 * quarks will be something like
602 * "rxvt" "keysym" "0xFF01" 626 * "rxvt" "keysym" "0xFF01"
603 * value will be a string 627 * value will be a string
604 */ 628 */
605/* ARGSUSED */ 629static int
606int
607rxvt_define_key (XrmDatabase *database __attribute__((unused)), 630rxvt_define_key (XrmDatabase *database ecb_unused,
608 XrmBindingList bindings __attribute__((unused)), 631 XrmBindingList bindings ecb_unused,
609 XrmQuarkList quarks, 632 XrmQuarkList quarks,
610 XrmRepresentation *type __attribute__((unused)), 633 XrmRepresentation *type ecb_unused,
611 XrmValue *value, 634 XrmValue *value,
612 XPointer closure __attribute__((unused))) 635 XPointer closure ecb_unused)
613{ 636{
614 int last; 637 int last;
615 638
616 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 639 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
617 ; 640 ;
… …
622} 645}
623 646
624/* 647/*
625 * look for something like this (XK_Delete) 648 * look for something like this (XK_Delete)
626 * rxvt*keysym.0xFFFF: "\177" 649 * rxvt*keysym.0xFFFF: "\177"
627 *
628 * arg will be
629 * NULL for ~/.Xdefaults and
630 * non-NULL for command-line options (need to allocate)
631 */ 650 */
632#define NEWARGLIM 500 /* `reasonable' size */
633 651
634struct keysym_vocabulary_t 652struct keysym_vocabulary_t
635{ 653{
636 const char *name; 654 const char *name;
637 unsigned short len; 655 unsigned short len;
638 unsigned short value; 656 unsigned short value;
639}; 657};
640keysym_vocabulary_t keysym_vocabulary[] = 658static const keysym_vocabulary_t keysym_vocabulary[] =
641{ 659{
642 { "ISOLevel3", 9, Level3Mask }, 660 { "ISOLevel3", 9, Level3Mask },
643 { "AppKeypad", 9, AppKeypadMask }, 661 { "AppKeypad", 9, AppKeypadMask },
644 { "Control", 7, ControlMask }, 662 { "Control", 7, ControlMask },
645 { "NumLock", 7, NumLockMask }, 663 { "NumLock", 7, NumLockMask },
… …
667}; 685};
668 686
669int 687int
670rxvt_term::parse_keysym (const char *str, const char *arg) 688rxvt_term::parse_keysym (const char *str, const char *arg)
671{ 689{
672 int n, sym; 690 int sym;
673 unsigned int state = 0; 691 unsigned int state = 0;
674 const char *pmodend = NULL; 692 const char *key = strrchr (str, '-');
675 char *newarg = NULL;
676 char newargstr[NEWARGLIM];
677 693
678 if (arg == NULL) 694 if (!key)
679 { 695 key = str;
680 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
681 return 0;
682
683 str += n; /* skip `keysym.' */
684 if ((pmodend = strchr (str, ':')) < str)
685 return -1;
686 }
687 else 696 else
688 pmodend = str + strlen(str); 697 key++;
689 698
690 for (--pmodend; str < pmodend; --pmodend) 699 // string or key is empty
691 if (*pmodend == '-') 700 if (*arg == '\0' || *key == '\0')
692 break; 701 return -1;
693 702
703 // parse modifiers
694 while (str < pmodend) 704 while (str < key)
695 { 705 {
696 unsigned int i; 706 unsigned int i;
697 707
698 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 708 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
699 { 709 {
700 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 710 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
701 { 711 {
702 state |= keysym_vocabulary[i].value; 712 state |= keysym_vocabulary[i].value;
703 str += keysym_vocabulary[i].len; 713 str += keysym_vocabulary[i].len;
704 break; 714 break;
705 } 715 }
706 } 716 }
707 717
708 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 718 if (i >= ecb_array_length (keysym_vocabulary))
709 return -1; 719 return -1;
710 720
711 if (*str == '-') 721 if (*str == '-')
712 ++str; 722 ++str;
713 } 723 }
714 724
715 /* some scanf () have trouble with a 0x prefix */ 725 // convert keysym name to keysym number
716 if (str[0] == '0' && toupper (str[1]) == 'X') 726 if ((sym = XStringToKeysym (str)) == None)
717 { 727 {
718 str += 2; 728 // fallback on hexadecimal parsing
719 729 char *end;
730 sym = strtol (str, &end, 16);
720 if (arg) 731 if (*end)
721 {
722 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
723 return -1;
724 }
725 else
726 {
727 if (sscanf (str, "%x:", &sym) != 1)
728 return -1;
729
730 /* cue to ':', it's there since sscanf () worked */
731 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
732 newargstr[NEWARGLIM - 1] = '\0';
733 newarg = newargstr;
734 }
735 }
736 else
737 {
738 /*
739 * convert keysym name to keysym number
740 */
741 strncpy (newargstr, str, NEWARGLIM - 1);
742 newargstr[NEWARGLIM - 1] = '\0';
743
744 if (arg == NULL)
745 {
746 if ((newarg = strchr (newargstr, ':')) == NULL)
747 return -1;
748
749 *newarg++ = '\0'; /* terminate keysym name */
750 }
751
752 if ((sym = XStringToKeysym (newargstr)) == None)
753 return -1; 732 return -1;
754 } 733 }
755 734
756 if (newarg == NULL) 735 wchar_t *ws = rxvt_mbstowcs (arg);
757 { 736 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
758 strncpy (newargstr, arg, NEWARGLIM - 1);
759 newargstr[NEWARGLIM - 1] = '\0';
760 newarg = newargstr;
761 }
762
763 rxvt_Str_trim (newarg);
764 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
765 return -1;
766
767 keyboard->register_user_translation (sym, state, newarg); 737 keyboard->register_user_translation (sym, state, ws);
738 free (ws);
768 return 1; 739 return 1;
769} 740}
770 741
771# endif /* KEYSYM_RESOURCE */ 742# endif /* KEYSYM_RESOURCE */
743#endif /* NO_RESOURCES */
772 744
773# ifndef USE_XGETDEFAULT 745static char *
774/*{{{ rxvt_get_xdefaults () */ 746get_res (XrmDatabase database, const char *program, const char *option)
775/*
776 * the matching algorithm used for memory-save fake resources
777 */
778void
779rxvt_term::get_xdefaults (FILE *stream, const char *name)
780{ 747{
781 unsigned int len; 748 char resource[512];
782 char *str, buffer[256]; 749 char *type;
750 XrmValue result;
783 751
784 if (stream == NULL) 752 snprintf (resource, sizeof (resource), "%s.%s", program, option);
785 return; 753 XrmGetResource (database, resource, resource, &type, &result);
786 754
787 len = strlen (name); 755 return result.addr;
788 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 756}
757
758const char *
759rxvt_term::x_resource (const char *name)
760{
761 XrmDatabase database = XrmGetDatabase (dpy);
762
763 const char *p = get_res (database, rs[Rs_name], name);
764 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
765
766 if (p == NULL || (p0 && strcmp (p, p0) == 0))
789 { 767 {
790 unsigned int entry, n; 768 p = get_res (database, RESCLASS, name);
791 769#ifdef RESFALLBACK
792 while (*str && isspace (*str)) 770 if (p == NULL || (p0 && strcmp (p, p0) == 0))
793 str++; /* leading whitespace */ 771 p = get_res (database, RESFALLBACK, name);
794 772#endif
795 if ((str[len] != '*' && str[len] != '.')
796 || (len && strncmp (str, name, len)))
797 continue;
798 str += (len + 1); /* skip `name*' or `name.' */
799
800# ifdef KEYSYM_RESOURCE
801 if (!parse_keysym (str, NULL))
802# endif /* KEYSYM_RESOURCE */
803 for (entry = 0; entry < optList_size; entry++)
804 {
805 const char *kw = optList[entry].kw;
806
807 if (kw == NULL)
808 continue;
809
810 n = strlen (kw);
811 if (str[n] == ':' && rxvt_Str_match (str, kw))
812 {
813 /* skip `keyword:' */
814 str += n + 1;
815 rxvt_Str_trim (str);
816 n = strlen (str);
817
818 if (n && rs[optList[entry].doff] == NULL)
819 {
820 /* not already set */
821 int s;
822 char *p = 0;
823
824 for (int o = 0;;)
825 {
826 p = (char *)rxvt_realloc (p, o + n + 1);
827 memcpy (p + o, str, n);
828 o += n;
829 p[o] = 0;
830
831 if (o == 0 || p[o - 1] != '\\') // continuation line
832 break;
833
834 o--; // eat "\"
835
836 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
837 break;
838
839 rxvt_Str_trim (str);
840 n = strlen (str);
841 }
842
843 rs[optList[entry].doff] = p;
844 allocated.push_back (p);
845
846 if (optList_isBool (entry))
847 {
848 s = strcasecmp (str, "true") == 0
849 || strcasecmp (str, "yes") == 0
850 || strcasecmp (str, "on") == 0
851 || strcmp (str, "1") == 0;
852
853 if (optList_isReverse (entry))
854 s = !s;
855
856 if (s)
857 options |= optList[entry].flag;
858 else
859 options &= ~optList[entry].flag;
860 }
861 }
862
863 break;
864 }
865 }
866 } 773 }
867 774
868 rewind (stream); 775 if (p == NULL && p0)
776 p = p0;
777
778 return p;
869} 779}
870 780
871/*}}} */
872# endif /* ! USE_XGETDEFAULT */
873#endif /* NO_RESOURCES */
874
875/*{{{ read the resources files */
876/*
877 * using XGetDefault () or the hand-rolled replacement
878 */
879/* ARGSUSED */
880void 781void
881rxvt_term::extract_resources () 782rxvt_term::extract_resources ()
882{ 783{
883 dDisp;
884
885#ifndef NO_RESOURCES 784#ifndef NO_RESOURCES
886 785 XrmDatabase database = XrmGetDatabase (dpy);
887 char *homedir = (char *)getenv ("HOME");
888 char fname[1024];
889
890# if defined XAPPLOADDIR
891# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
892 /* Compute the path of the possibly available localized Rxvt file */
893 char localepath[1024];
894
895 if (locale)
896 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
897 else
898 localepath[0] = 0;
899# endif
900# endif
901
902# ifdef USE_XGETDEFAULT
903 /*
904 * get resources using the X library function
905 */
906 int entry;
907
908# ifdef XrmEnumOneLevel
909 int i;
910 char *displayResource, *xe;
911 XrmName name_prefix[3];
912 XrmClass class_prefix[3];
913 XrmDatabase database, rdb1;
914
915 XrmInitialize ();
916 database = NULL;
917
918 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
919
920 // 6. System wide per application default file.
921 /* Add in Rxvt file */
922# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
923 if (*localepath
924 && ((rdb1 = XrmGetFileDatabase (localepath))
925 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
926# endif
927 XrmMergeDatabases (rdb1, &database); 786 XrmMergeDatabases (option_db, &database);
928 787 option_db = NULL;
929 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
930 if ((xe = (char *)getenv ("XAPPLRESDIR")))
931 {
932 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
933
934 if ((rdb1 = XrmGetFileDatabase (fname)))
935 XrmMergeDatabases (rdb1, &database);
936 }
937
938 // 5. User's per application default file.
939 // none
940
941 // 4. User's defaults file.
942 /* Get any Xserver defaults */
943 displayResource = XResourceManagerString (disp);
944 if (displayResource != NULL)
945 {
946 if ((rdb1 = XrmGetStringDatabase (displayResource)))
947 XrmMergeDatabases (rdb1, &database);
948 }
949 else if (homedir)
950 {
951 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
952
953 if ((rdb1 = XrmGetFileDatabase (fname)))
954 XrmMergeDatabases (rdb1, &database);
955 }
956
957 /* Get screen specific resources */
958 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
959 if (displayResource != NULL)
960 {
961 if ((rdb1 = XrmGetStringDatabase (displayResource)))
962 /* Merge with screen-independent resources */
963 XrmMergeDatabases (rdb1, &database);
964
965 XFree (displayResource);
966 }
967
968 // 3. User's per host defaults file
969 /* Add in XENVIRONMENT file */
970 if ((xe = (char *)getenv ("XENVIRONMENT"))
971 && (rdb1 = XrmGetFileDatabase (xe)))
972 XrmMergeDatabases (rdb1, &database);
973 else if (homedir)
974 {
975 struct utsname un;
976
977 if (!uname (&un))
978 {
979 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
980
981 if ((rdb1 = XrmGetFileDatabase (fname)))
982 XrmMergeDatabases (rdb1, &database);
983 }
984 }
985
986 XrmSetDatabase (disp, database);
987# endif
988
989 /* 788 /*
990 * Query resources for options that affect us 789 * Query resources for options that affect us
991 */ 790 */
992 for (entry = 0; entry < optList_size; entry++) 791 for (int entry = 0; entry < ecb_array_length (optList); entry++)
993 { 792 {
994 int s;
995 char *p, *p0;
996 const char *kw = optList[entry].kw; 793 const char *kw = optList[entry].kw;
997 794
998 if (kw == NULL || rs[optList[entry].doff] != NULL) 795 if (kw == NULL || rs[optList[entry].doff] != NULL)
999 continue; /* previously set */ 796 continue; // previously set
1000 797
1001 p = XGetDefault (disp, rs[Rs_name], kw); 798 const char *p = x_resource (kw);
1002 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1003 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1004 {
1005 p = XGetDefault (disp, RESCLASS, kw);
1006#ifdef RESFALLBACK
1007 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1008 p = XGetDefault (disp, RESFALLBACK, kw);
1009#endif
1010 }
1011
1012 if (p == NULL && p0)
1013 p = p0;
1014 799
1015 if (p) 800 if (p)
1016 { 801 {
802 p = strdup (p);
803 allocated.push_back ((void *)p);
1017 rs[optList[entry].doff] = p; 804 rs[optList[entry].doff] = p;
1018 805
1019 if (optList_isBool (entry)) 806 if (optList_isBool (entry))
1020 { 807 {
1021 s = strcasecmp (p, "TRUE") == 0 808 bool s = parse_bool_resource (p);
1022 || strcasecmp (p, "YES") == 0
1023 || strcasecmp (p, "ON") == 0
1024 || strcasecmp (p, "1") == 0;
1025 809
1026 if (optList_isReverse (entry)) 810 if (optList_isReverse (entry))
1027 s = !s; 811 s = !s;
1028 812
1029 if (s) 813 set_option (optList[entry].index, s);
1030 options |= optList[entry].flag;
1031 else
1032 options &= ~optList[entry].flag;
1033 } 814 }
1034 } 815 }
1035 } 816 }
817#endif /* NO_RESOURCES */
818}
1036 819
820void
821rxvt_term::extract_keysym_resources ()
822{
823#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
824 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
825#endif
826}
827
828#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
829void
830rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
831 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
832{
1037 /* 833 /*
1038 * [R5 or later]: enumerate the resource database 834 * [R5 or later]: enumerate the resource database
1039 */ 835 */
1040# ifdef KEYSYM_RESOURCE 836 XrmDatabase database = XrmGetDatabase (dpy);
837 XrmName name_prefix[3];
838 XrmClass class_prefix[3];
839
1041 name_prefix[0] = XrmStringToName (rs[Rs_name]); 840 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1042 name_prefix[1] = XrmStringToName ("keysym"); 841 name_prefix[1] = XrmStringToName (n_prefix);
1043 name_prefix[2] = NULLQUARK; 842 name_prefix[2] = NULLQUARK;
1044 class_prefix[0] = XrmStringToName (RESCLASS); 843 class_prefix[0] = XrmStringToName (RESCLASS);
1045 class_prefix[1] = XrmStringToName ("Keysym"); 844 class_prefix[1] = XrmStringToName (c_prefix);
1046 class_prefix[2] = NULLQUARK; 845 class_prefix[2] = NULLQUARK;
1047 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 846 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1048 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 847 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1049 XrmEnumOneLevel, rxvt_define_key, NULL); 848 mode, proc, NULL);
1050# ifdef RESFALLBACK 849# ifdef RESFALLBACK
1051 name_prefix[0] = XrmStringToName (RESFALLBACK);
1052 name_prefix[1] = XrmStringToName ("keysym");
1053 class_prefix[0] = XrmStringToName (RESFALLBACK); 850 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
1054 class_prefix[1] = XrmStringToName ("Keysym");
1055 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1056 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 852 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1057 XrmEnumOneLevel, rxvt_define_key, NULL); 853 mode, proc, NULL);
1058# endif 854# endif
1059# endif
1060
1061# else /* USE_XGETDEFAULT */
1062 /* get resources the hard way, but save lots of memory */
1063 FILE *fd = NULL;
1064
1065 if (homedir)
1066 {
1067 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1068
1069 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1070 {
1071 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1072
1073 if ((fd = fopen (fname, "r")) != NULL)
1074 break;
1075 }
1076 }
1077 /*
1078 * The normal order to match resources is the following:
1079 * @ global resources (partial match, ~/.Xdefaults)
1080 * @ application file resources (XAPPLOADDIR/Rxvt)
1081 * @ class resources (~/.Xdefaults)
1082 * @ private resources (~/.Xdefaults)
1083 *
1084 * However, for the hand-rolled resources, the matching algorithm
1085 * checks if a resource string value has already been allocated
1086 * and won't overwrite it with (in this case) a less specific
1087 * resource value.
1088 *
1089 * This avoids multiple allocation. Also, when we've called this
1090 * routine command-line string options have already been applied so we
1091 * needn't to allocate for those resources.
1092 *
1093 * So, search in resources from most to least specific.
1094 *
1095 * Also, use a special sub-class so that we can use either or both of
1096 * "XTerm" and "Rxvt" as class names.
1097 */
1098
1099 get_xdefaults (fd, rs[Rs_name]);
1100 get_xdefaults (fd, RESCLASS);
1101# ifdef RESFALLBACK
1102 get_xdefaults (fd, RESFALLBACK);
1103# endif
1104
1105# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1106 {
1107 FILE *ad = NULL;
1108
1109# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1110 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1111# endif
1112 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1113 if (ad != NULL)
1114 {
1115 get_xdefaults (ad, RESCLASS);
1116 get_xdefaults (ad, "");
1117 fclose (ad);
1118 }
1119 }
1120# endif /* XAPPLOADDIR */
1121
1122 get_xdefaults (fd, ""); /* partial match */
1123 if (fd != NULL)
1124 fclose (fd);
1125# endif /* USE_XGETDEFAULT */
1126
1127#endif /* NO_RESOURCES */
1128} 855}
856#endif
1129 857
1130/*}}} */
1131/*----------------------- end-of-file (C source) -----------------------*/ 858/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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