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.91 by root, Tue Jan 31 19:54:39 2006 UTC vs.
Revision 1.160 by sf-exg, Sun Dec 18 02:14:59 2011 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-2006 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.
… …
26#include "../config.h" 27#include "../config.h"
27#include "rxvt.h" 28#include "rxvt.h"
28#include "version.h" 29#include "version.h"
29 30
30#ifdef KEYSYM_RESOURCE 31#ifdef KEYSYM_RESOURCE
31#include "keyboard.h" 32# include "keyboard.h"
32#endif 33#endif
33 34
34/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
35#define Optflag_Reverse 0x40000000UL 36#define Optflag_Reverse 1
36#define Optflag_Boolean 0x80000000UL 37#define Optflag_Boolean 2
37#define Optflag_mask 0x3fffffffUL 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)}
49 51
50/* STRG () - command-line option, with/without resource */ 52/* STRG () - command-line option, with/without resource */
51#define STRG(rsp, kw, opt, arg, desc) \ 53#define STRG(rsp, kw, opt, arg, desc) \
52 {0, (rsp), (kw), (opt), (arg), (desc)} 54 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
53 55
54/* RSTRG () - resource/long-option */ 56/* RSTRG () - resource/long-option */
55#define RSTRG(rsp, kw, arg) \ 57#define RSTRG(rsp, kw, arg) \
56 {0, (rsp), (kw), NULL, (arg), NULL} 58 {0, 0, (rsp), (kw), NULL, (arg), NULL}
57 59
58/* BOOL () - regular boolean `-/+' flag */ 60/* BOOL () - regular boolean `-/+' flag */
59#define BOOL(rsp, kw, opt, flag, desc) \ 61#define BOOL(rsp, kw, opt, option, flag, desc) \
60 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 62 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
61 63
62/* SWCH () - `-' flag */ 64/* SWCH () - `-' flag */
63#define SWCH(opt, flag, desc) \ 65#define SWCH(opt, option, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 66 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 67
66/* convenient macros */ 68/* convenient macros */
67#define optList_strlen(i) \ 69#define optList_isString(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 70 (optList[i].flag == 0)
69#define optList_isBool(i) \ 71#define optList_isBool(i) \
70 (optList[i].flag & Optflag_Boolean) 72 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 73#define optList_isReverse(i) \
72 (optList[i].flag & Optflag_Reverse) 74 (optList[i].flag & Optflag_Reverse)
73#define optList_size \ 75#define optList_isInfo(i) \
74 (sizeof (optList) / sizeof (optList[0])) 76 (optList[i].flag & Optflag_Info)
75 77
76static const struct 78static const struct
77 { 79 {
80 const uint8_t index; /* Option index */
78 const unsigned long flag; /* Option flag */ 81 const uint8_t flag; /* Option flag */
79 const int doff; /* data offset */ 82 const int16_t doff; /* resource value index or -1 */
80 const char *kw; /* keyword */ 83 const char *kw; /* keyword */
81 const char *opt; /* option */ 84 const char *opt; /* option */
82 const char *arg; /* argument */ 85 const char *arg; /* argument */
83 const char *desc; /* description */ 86 const char *desc; /* description */
84 } 87 }
… …
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 89 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 90 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"), 91 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 92 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 93 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
91 SWCH ("C", Opt_console, "intercept console messages"), 94 SWCH ("C", Opt_console, 0, "intercept console messages"),
92 SWCH ("iconic", Opt_iconic, "start iconic"), 95 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 96 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
97 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 98 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 99 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 100 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
101 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 102 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 103 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 104 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 105 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
102 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 106 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 107 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
104 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 108 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
105#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT 113#if ENABLE_TRANSPARENCY
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, NULL), 115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
113# if TINTING
114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
118 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
119#endif
120#if OFF_FOCUS_FADING
121 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
122 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
123#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
125#ifndef NO_BELL
126# if ENABLE_FRILLS
127 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
115# endif 128# endif
116#endif
117#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
120#endif
121#if TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
123#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
125#ifndef NO_BELL
126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 129 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 130# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 131 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
129# endif 132# endif
130#endif 133#endif
131#ifdef META8_OPTION 134#ifdef META8_OPTION
132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 135 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
133#endif 136#endif
134#ifdef MOUSE_WHEEL 137#ifdef MOUSE_WHEEL
135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 138 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
136#endif 139#endif
137#if ENABLE_FRILLS 140#if ENABLE_FRILLS
138 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
139 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 142 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
140 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 143 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
141#endif 144#endif
142#if CURSOR_BLINK 145#if CURSOR_BLINK
143 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 146 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
144#endif 147#endif
145#ifdef POINTER_BLANK 148#ifdef POINTER_BLANK
146 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 149 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
147#endif 150#endif
148 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 151 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
149 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 152 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
150 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 153 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
151 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 154 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
166#ifndef NO_BOLD_UNDERLINE_REVERSE 169#ifndef NO_BOLD_UNDERLINE_REVERSE
167 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 170 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
168 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 171 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
169 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 172 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
170 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 173 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
172#if ENABLE_FRILLS 175#if ENABLE_FRILLS
173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 176 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
174#endif 177#endif
175#ifdef KEEP_SCROLLCOLOR
176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
179#ifdef RXVT_SCROLLBAR
177 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 180 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
178#endif /* KEEP_SCROLLCOLOR */ 181#endif
179#ifdef OPTION_HC 182#ifdef OPTION_HC
180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 183 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
184 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
181#endif 185#endif
182#ifndef NO_CURSORCOLOR 186#ifndef NO_CURSORCOLOR
183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 187 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
184 /* command-line option = resource name */ 188 /* command-line option = resource name */
185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
186#endif /* NO_CURSORCOLOR */ 190#endif /* NO_CURSORCOLOR */
187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 191 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
188 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 192 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
190#ifdef XPM_BACKGROUND 194#ifdef BG_IMAGE_FROM_FILE
191 RSTRG (Rs_path, "path", "search path"), 195 RSTRG (Rs_path, "path", "search path"),
192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 196 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
197# if ENABLE_EWMH
198 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
199# endif
193#endif 200#endif
194 /* fonts: command-line option = resource name */ 201 /* fonts: command-line option = resource name */
195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 202 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
196#if ENABLE_STYLES 203#if ENABLE_STYLES
197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
198 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 205 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
199 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 206 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
200 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 207 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
201#endif 208#endif
202#ifdef USE_XIM 209#ifdef USE_XIM
203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 210 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
204 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 211 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
205 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 212 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
206 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 213 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
207#endif /* USE_XIM */ 214#endif /* USE_XIM */
208 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 215 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
209 STRG (Rs_title, "title", "title", "string", "title name for window"), 216 STRG (Rs_title, "title", "title", "string", "title name for window"),
210 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 217 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 218 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 219 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213#if ENABLE_XEMBED 220#if ENABLE_XEMBED
214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 221 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
215#endif 222#endif
216#if XFT 223#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 224 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
225 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
218#endif 226#endif
219#if ENABLE_FRILLS 227#if ENABLE_FRILLS
220 RSTRG (Rs_transient_for, "transient-for", "windowid"), 228 RSTRG (Rs_transient_for, "transient-for", "windowid"),
221 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), 229 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
222 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 230 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
223 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 231 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"), 232 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 233 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 234 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 235 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 236 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
229 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 237 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
238 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
239#endif
240#ifdef BUILTIN_GLYPHS
241 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231#endif 242#endif
232#ifdef POINTER_BLANK 243#ifdef POINTER_BLANK
233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 244 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
234#endif 245#endif
235#ifndef NO_BACKSPACE_KEY 246#ifndef NO_BACKSPACE_KEY
236 RSTRG (Rs_backspace_key, "backspacekey", "string"), 247 RSTRG (Rs_backspace_key, "backspacekey", "string"),
237#endif 248#endif
238#ifndef NO_DELETE_KEY 249#ifndef NO_DELETE_KEY
239 RSTRG (Rs_delete_key, "deletekey", "string"), 250 RSTRG (Rs_delete_key, "deletekey", "string"),
240#endif 251#endif
241 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
242#ifdef PRINTPIPE 252#ifdef PRINTPIPE
243 RSTRG (Rs_print_pipe, "print-pipe", "string"), 253 RSTRG (Rs_print_pipe, "print-pipe", "string"),
244#endif 254#endif
245 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 255 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
246#ifdef CUTCHAR_RESOURCE
247 RSTRG (Rs_cutchars, "cutchars", "string"), 256 RSTRG (Rs_cutchars, "cutchars", "string"),
248#endif /* CUTCHAR_RESOURCE */
249 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 257 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
250#ifndef NO_SECONDARY_SCREEN 258#ifndef NO_SECONDARY_SCREEN
251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 259 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 260 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
253#endif 261#endif
254#if ENABLE_PERL 262#if ENABLE_PERL
255 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 263 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
256 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 264 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
257 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 265 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
258 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 266 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
259#endif 267#endif
260#ifndef NO_RESOURCES 268#if ISO_14755
261 INFO ("xrm", "string", "X resource"), 269 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
270 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
271#endif
272#ifdef HAVE_AFTERIMAGE
273 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
262#endif 274#endif
263 INFO ("e", "command arg ...", "command to execute") 275 INFO ("e", "command arg ...", "command to execute")
264 }; 276 };
265 277
266#undef INFO 278#undef INFO
267#undef STRG 279#undef STRG
268#undef RSTRG 280#undef RSTRG
269#undef SWCH 281#undef SWCH
270#undef BOOL 282#undef BOOL
271/*}}} */
272 283
273static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
274static const char optionsstring[] = "options: " 285static const char optionsstring[] = "options: "
275#if ENABLE_PERL 286#if ENABLE_PERL
276 "perl," 287 "perl,"
… …
311#endif 322#endif
312 "," 323 ","
313#if OFF_FOCUS_FADING 324#if OFF_FOCUS_FADING
314 "fade," 325 "fade,"
315#endif 326#endif
316#if defined(XPM_BACKGROUND)
317 "XPM,"
318#endif
319#if defined(TRANSPARENT) 327#if defined(ENABLE_TRANSPARENCY)
320 "transparent," 328 "transparent,"
321#endif
322#if TINTING
323 "tint," 329 "tint,"
330#endif
331#if HAVE_AFTERIMAGE
332 "afterimage,"
333#endif
334#if HAVE_PIXBUF
335 "pixbuf,"
324#endif 336#endif
325#if defined(USE_XIM) 337#if defined(USE_XIM)
326 "XIM," 338 "XIM,"
327#endif 339#endif
328#if defined(NO_BACKSPACE_KEY) 340#if defined(NO_BACKSPACE_KEY)
… …
356 "pointerBlank," 368 "pointerBlank,"
357#endif 369#endif
358#if defined(NO_RESOURCES) 370#if defined(NO_RESOURCES)
359 "NoResources," 371 "NoResources,"
360#endif 372#endif
361 "scrollbars=" 373 "scrollbars=plain"
362#if !defined(HAVE_SCROLLBARS)
363 "NONE"
364#else
365# if defined(PLAIN_SCROLLBAR)
366 "plain"
367# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
368 "+"
369# endif
370# endif
371# if defined(RXVT_SCROLLBAR) 374#if defined(RXVT_SCROLLBAR)
372 "rxvt" 375 "+rxvt"
373# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
374 "+"
375# endif
376# endif 376#endif
377# if defined(NEXT_SCROLLBAR) 377#if defined(NEXT_SCROLLBAR)
378 "NeXT" 378 "+NeXT"
379# if defined(XTERM_SCROLLBAR)
380 "+"
381# endif
382# endif 379#endif
383# if defined(XTERM_SCROLLBAR) 380#if defined(XTERM_SCROLLBAR)
384 "xterm" 381 "+xterm"
385# endif
386#endif 382#endif
387 "\nUsage: "; /* Usage */ 383 "\nUsage: "; /* Usage */
388 384
389#define INDENT 18 385#define INDENT 18
390 386
… …
404 switch (type) 400 switch (type)
405 { 401 {
406 case 0: /* brief listing */ 402 case 0: /* brief listing */
407 rxvt_log (" [-help] [--help]\n"); 403 rxvt_log (" [-help] [--help]\n");
408 404
409 for (col = 1, i = 0; i < optList_size; i++) 405 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
410 if (optList[i].desc != NULL) 406 if (optList[i].desc != NULL)
411 { 407 {
412 int len = 0; 408 int len = 0;
413 409
414 if (!optList_isBool (i)) 410 if (optList[i].arg)
415 { 411 len = strlen (optList[i].arg) + 1;
416 len = optList_strlen (i);
417 if (len > 0)
418 len++; /* account for space */
419 }
420#ifdef DEBUG_STRICT
421 assert (optList[i].opt != NULL); 412 assert (optList[i].opt != NULL);
422#endif
423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 413 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
424 col += len; 414 col += len;
425 if (col > 79) 415 if (col > 79)
416 {
426 { /* assume regular width */ 417 /* assume regular width */
427 rxvt_log ("\n"); 418 rxvt_log ("\n");
428 col = 1 + len; 419 col = 1 + len;
429 } 420 }
430 421
431 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 422 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
432 if (optList_strlen (i)) 423 if (optList[i].arg)
433 rxvt_log (" %s]", optList[i].arg); 424 rxvt_log (" %s]", optList[i].arg);
434 else 425 else
435 rxvt_log ("]"); 426 rxvt_log ("]");
436 } 427 }
437 break; 428 break;
438 429
439 case 1: /* full command-line listing */ 430 case 1: /* full command-line listing */
440 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 431 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
441 432
442 for (i = 0; i < optList_size; i++) 433 for (i = 0; i < ecb_array_length (optList); i++)
443 if (optList[i].desc != NULL) 434 if (optList[i].desc != NULL)
444 { 435 {
445#ifdef DEBUG_STRICT
446 assert (optList[i].opt != NULL); 436 assert (optList[i].opt != NULL);
447#endif
448 rxvt_log (" %s%s %-*s%s%s\n", 437 rxvt_log (" %s%s %-*s%s%s\n",
449 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 438 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
450 (INDENT - strlen (optList[i].opt) 439 (INDENT - strlen (optList[i].opt)
451 + (optList_isBool (i) ? 0 : 2)), 440 + (optList_isBool (i) ? 0 : 2)),
452 (optList[i].arg ? optList[i].arg : ""), 441 (optList[i].arg ? optList[i].arg : ""),
… …
458 447
459 case 2: /* full resource listing */ 448 case 2: /* full resource listing */
460 rxvt_log (" [options] [-e command args]\n\n" 449 rxvt_log (" [options] [-e command args]\n\n"
461 "where resources (long-options) include:\n"); 450 "where resources (long-options) include:\n");
462 451
463 for (i = 0; i < optList_size; i++) 452 for (i = 0; i < ecb_array_length (optList); i++)
464 if (optList[i].kw != NULL) 453 if (optList[i].kw != NULL)
465 rxvt_log (" %s: %*s%s\n", 454 rxvt_log (" %s: %*s%s\n",
466 optList[i].kw, 455 optList[i].kw,
467 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 456 (INDENT - strlen (optList[i].kw)), "", /* XXX */
468 (optList_isBool (i) ? "boolean" : optList[i].arg)); 457 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
475 break; 464 break;
476 } 465 }
477 466
478 rxvt_log ("\n\n"); 467 rxvt_log ("\n\n");
479 rxvt_exit_failure (); 468 rxvt_exit_failure ();
480 /* NOTREACHED */
481} 469}
482 470
483/*}}} */ 471/*}}} */
484 472
485/*{{{ get command-line options before getting resources */ 473/*{{{ get command-line options before getting resources */
486void 474const char **
487rxvt_term::get_options (int argc, const char *const *argv) 475rxvt_term::get_options (int argc, const char *const *argv)
488{ 476{
489 int i, bad_option = 0; 477 int i, bad_option = 0;
490 478
491 for (i = 1; i < argc; i++) 479 for (i = 1; i < argc; i++)
492 { 480 {
493 unsigned int entry, longopt = 0; 481 unsigned int entry, longopt = 0;
494 const char *flag, *opt; 482 const char *opt;
483 int flag;
495 484
496 opt = argv[i]; 485 opt = argv[i];
497 486
498 if (*opt == '-') 487 if (*opt == '-')
499 { 488 {
500 flag = resval_on; 489 flag = 1;
501 490
502 if (*++opt == '-') 491 if (*++opt == '-')
503 longopt = *opt++; /* long option */ 492 longopt = *opt++; /* long option */
504 } 493 }
505 else if (*opt == '+') 494 else if (*opt == '+')
506 { 495 {
507 flag = resval_off; 496 flag = 0;
508 497
509 if (*++opt == '+') 498 if (*++opt == '+')
510 longopt = *opt++; /* long option */ 499 longopt = *opt++; /* long option */
511 } 500 }
512 else 501 else
… …
521 510
522 if (!strcmp (opt, "h")) 511 if (!strcmp (opt, "h"))
523 rxvt_usage (0); 512 rxvt_usage (0);
524 513
525 /* feature: always try to match long-options */ 514 /* feature: always try to match long-options */
526 for (entry = 0; entry < optList_size; entry++) 515 for (entry = 0; entry < ecb_array_length (optList); entry++)
527 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 516 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
528 || (!longopt 517 || (!longopt
529 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 518 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
530 break; 519 break;
531 520
532 if (entry < optList_size) 521 if (entry < ecb_array_length (optList)
522 && !optList_isInfo (entry))
533 { 523 {
534 if (optList_isReverse (entry)) 524 if (optList_isReverse (entry))
535 flag = flag == resval_on ? resval_off : resval_on; 525 flag = !flag;
536 526
537 if (optList_strlen (entry)) 527 if (optList_isString (entry))
538 { 528 {
539 /* 529 /*
540 * special cases are handled in main.c:main () to allow 530 * special cases are handled in init_resources () to allow
541 * X resources to set these values before we settle for 531 * X resources to set these values before we settle for
542 * default values 532 * default values
543 */ 533 */
544 534
545 if (optList[entry].doff != -1) 535 if (optList[entry].doff != -1)
536 {
537 if (flag && i+1 == argc)
538 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
539
546 rs[optList[entry].doff] = flag == resval_on && argv[i+1] 540 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
547 ? argv[++i] : resval_undef; 541 }
548 } 542 }
549 else 543 else
544 {
550 { /* boolean value */ 545 /* boolean value */
551 set_option (optList[entry].flag & Optflag_mask, flag == resval_on); 546 set_option (optList[entry].index, flag);
552 547
553 if (optList[entry].doff != -1) 548 if (optList[entry].doff != -1)
554 rs[optList[entry].doff] = flag; 549 rs[optList[entry].doff] = flag ? resval_on : resval_off;
555 } 550 }
556 } 551 }
552#ifndef NO_RESOURCES
553 else if (!strcmp (opt, "xrm"))
554 {
555 if (i+1 < argc)
556 XrmPutLineResource (&option_db, argv[++i]);
557 }
558#endif
559#ifdef KEYSYM_RESOURCE
560 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
561 {
562 if (i+1 < argc)
563 {
564 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
565 sprintf (res, "*.%s: %s\n", opt, argv[i]);
566 XrmPutLineResource (&option_db, res);
567 }
568 }
569#endif
570 else if (!strcmp (opt, "e"))
571 {
572 if (i+1 == argc)
573 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
574
575 return (const char **)argv + i + 1;
576 }
557 else 577 else
558#ifdef KEYSYM_RESOURCE
559 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
560 if (rxvt_Str_match (opt, "keysym."))
561 { 578 {
562 const char *str = argv[++i];
563
564 if (str != NULL)
565 parse_keysym (opt + sizeof ("keysym.") - 1, str);
566 }
567 else
568#endif
569 {
570 bad_option = 1; 579 bad_option = 1;
571 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 580 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
572 } 581 }
573 } 582 }
574 583
575 if (bad_option) 584 if (bad_option)
576 rxvt_usage (0); 585 rxvt_usage (0);
586
587 return 0;
577} 588}
578 589
579/*}}} */ 590/*}}} */
580 591
581#ifndef NO_RESOURCES 592#ifndef NO_RESOURCES
… …
586 * Define key from XrmEnumerateDatabase. 597 * Define key from XrmEnumerateDatabase.
587 * quarks will be something like 598 * quarks will be something like
588 * "rxvt" "keysym" "0xFF01" 599 * "rxvt" "keysym" "0xFF01"
589 * value will be a string 600 * value will be a string
590 */ 601 */
591/* ARGSUSED */ 602static int
592int
593rxvt_define_key (XrmDatabase *database UNUSED, 603rxvt_define_key (XrmDatabase *database ecb_unused,
594 XrmBindingList bindings UNUSED, 604 XrmBindingList bindings ecb_unused,
595 XrmQuarkList quarks, 605 XrmQuarkList quarks,
596 XrmRepresentation *type UNUSED, 606 XrmRepresentation *type ecb_unused,
597 XrmValue *value, 607 XrmValue *value,
598 XPointer closure UNUSED) 608 XPointer closure ecb_unused)
599{ 609{
600 int last; 610 int last;
601 611
602 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 612 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
603 ; 613 ;
… …
608} 618}
609 619
610/* 620/*
611 * look for something like this (XK_Delete) 621 * look for something like this (XK_Delete)
612 * rxvt*keysym.0xFFFF: "\177" 622 * rxvt*keysym.0xFFFF: "\177"
613 *
614 * arg will be
615 * NULL for ~/.Xdefaults and
616 * non-NULL for command-line options (need to allocate)
617 */ 623 */
618#define NEWARGLIM 500 /* `reasonable' size */
619 624
620struct keysym_vocabulary_t 625struct keysym_vocabulary_t
621{ 626{
622 const char *name; 627 const char *name;
623 unsigned short len; 628 unsigned short len;
624 unsigned short value; 629 unsigned short value;
625}; 630};
626keysym_vocabulary_t keysym_vocabulary[] = 631static const keysym_vocabulary_t keysym_vocabulary[] =
627{ 632{
628 { "ISOLevel3", 9, Level3Mask }, 633 { "ISOLevel3", 9, Level3Mask },
629 { "AppKeypad", 9, AppKeypadMask }, 634 { "AppKeypad", 9, AppKeypadMask },
630 { "Control", 7, ControlMask }, 635 { "Control", 7, ControlMask },
631 { "NumLock", 7, NumLockMask }, 636 { "NumLock", 7, NumLockMask },
… …
653}; 658};
654 659
655int 660int
656rxvt_term::parse_keysym (const char *str, const char *arg) 661rxvt_term::parse_keysym (const char *str, const char *arg)
657{ 662{
658 int n, sym; 663 int sym;
659 unsigned int state = 0; 664 unsigned int state = 0;
660 const char *pmodend = NULL; 665 const char *key = strrchr (str, '-');
661 char *newarg = NULL;
662 char newargstr[NEWARGLIM];
663 666
664 if (arg == NULL) 667 if (!key)
665 { 668 key = str;
666 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
667 return 0;
668
669 str += n; /* skip `keysym.' */
670 if (!(pmodend = strchr (str, ':')))
671 return -1;
672 }
673 else 669 else
674 pmodend = str + strlen(str); 670 key++;
675 671
676 for (--pmodend; str < pmodend; --pmodend) 672 // string or key is empty
677 if (*pmodend == '-') 673 if (*arg == '\0' || *key == '\0')
678 break; 674 return -1;
679 675
676 // parse modifiers
680 while (str < pmodend) 677 while (str < key)
681 { 678 {
682 unsigned int i; 679 unsigned int i;
683 680
684 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 681 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
685 { 682 {
686 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 683 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
687 { 684 {
688 state |= keysym_vocabulary[i].value; 685 state |= keysym_vocabulary[i].value;
689 str += keysym_vocabulary[i].len; 686 str += keysym_vocabulary[i].len;
690 break; 687 break;
691 } 688 }
692 } 689 }
693 690
694 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 691 if (i >= ecb_array_length (keysym_vocabulary))
695 return -1; 692 return -1;
696 693
697 if (*str == '-') 694 if (*str == '-')
698 ++str; 695 ++str;
699 } 696 }
700 697
701 /* some scanf () have trouble with a 0x prefix */ 698 // convert keysym name to keysym number
702 if (str[0] == '0' && toupper (str[1]) == 'X') 699 if ((sym = XStringToKeysym (str)) == None)
703 { 700 {
704 str += 2; 701 // fallback on hexadecimal parsing
705 702 char *end;
703 sym = strtol (str, &end, 16);
706 if (arg) 704 if (*end)
707 {
708 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
709 return -1;
710 }
711 else
712 {
713 if (sscanf (str, "%x:", &sym) != 1)
714 return -1;
715
716 /* cue to ':', it's there since sscanf () worked */
717 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
718 newargstr[NEWARGLIM - 1] = '\0';
719 newarg = newargstr;
720 }
721 }
722 else
723 {
724 /*
725 * convert keysym name to keysym number
726 */
727 strncpy (newargstr, str, NEWARGLIM - 1);
728 newargstr[NEWARGLIM - 1] = '\0';
729
730 if (arg == NULL)
731 {
732 if ((newarg = strchr (newargstr, ':')) == NULL)
733 return -1;
734
735 *newarg++ = '\0'; /* terminate keysym name */
736 }
737
738 if ((sym = XStringToKeysym (newargstr)) == None)
739 return -1; 705 return -1;
740 } 706 }
741 707
742 if (newarg == NULL) 708 wchar_t *ws = rxvt_mbstowcs (arg);
743 { 709 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
744 strncpy (newargstr, arg, NEWARGLIM - 1);
745 newargstr[NEWARGLIM - 1] = '\0';
746 newarg = newargstr;
747 }
748
749 rxvt_Str_trim (newarg);
750 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
751 return -1;
752
753 keyboard->register_user_translation (sym, state, newarg); 710 keyboard->register_user_translation (sym, state, ws);
711 free (ws);
754 return 1; 712 return 1;
755} 713}
756 714
757# endif /* KEYSYM_RESOURCE */ 715# endif /* KEYSYM_RESOURCE */
758#endif /* NO_RESOURCES */ 716#endif /* NO_RESOURCES */
759 717
760static char * 718static char *
761get_res (XrmDatabase database, const char *program, const char *option) 719get_res (XrmDatabase database, const char *program, const char *option)
762{ 720{
763 char resource[512]; 721 char resource[512];
… …
771} 729}
772 730
773const char * 731const char *
774rxvt_term::x_resource (const char *name) 732rxvt_term::x_resource (const char *name)
775{ 733{
776 XrmDatabase database = XrmGetDatabase (xdisp); 734 XrmDatabase database = XrmGetDatabase (dpy);
777 735
778 const char *p = get_res (database, rs[Rs_name], name); 736 const char *p = get_res (database, rs[Rs_name], name);
779 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 737 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
780 738
781 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 739 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
795 753
796void 754void
797rxvt_term::extract_resources () 755rxvt_term::extract_resources ()
798{ 756{
799#ifndef NO_RESOURCES 757#ifndef NO_RESOURCES
758 XrmDatabase database = XrmGetDatabase (dpy);
759 XrmMergeDatabases (option_db, &database);
760 option_db = NULL;
800 /* 761 /*
801 * Query resources for options that affect us 762 * Query resources for options that affect us
802 */ 763 */
803 for (int entry = 0; entry < optList_size; entry++) 764 for (int entry = 0; entry < ecb_array_length (optList); entry++)
804 { 765 {
805 int s; 766 int s;
806 const char *kw = optList[entry].kw; 767 const char *kw = optList[entry].kw;
807 768
808 if (kw == NULL || rs[optList[entry].doff] != NULL) 769 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
824 || strcasecmp (p, "1") == 0; 785 || strcasecmp (p, "1") == 0;
825 786
826 if (optList_isReverse (entry)) 787 if (optList_isReverse (entry))
827 s = !s; 788 s = !s;
828 789
829 set_option (optList[entry].flag & Optflag_mask, s); 790 set_option (optList[entry].index, s);
830 } 791 }
831 } 792 }
832 } 793 }
794#endif /* NO_RESOURCES */
795}
833 796
797void
798rxvt_term::extract_keysym_resources ()
799{
800#ifndef NO_RESOURCES
834 /* 801 /*
835 * [R5 or later]: enumerate the resource database 802 * [R5 or later]: enumerate the resource database
836 */ 803 */
837# ifdef KEYSYM_RESOURCE 804# ifdef KEYSYM_RESOURCE
838 XrmDatabase database = XrmGetDatabase (xdisp); 805 XrmDatabase database = XrmGetDatabase (dpy);
839 XrmName name_prefix[3]; 806 XrmName name_prefix[3];
840 XrmClass class_prefix[3]; 807 XrmClass class_prefix[3];
841 808
842 name_prefix[0] = XrmStringToName (rs[Rs_name]); 809 name_prefix[0] = XrmStringToName (rs[Rs_name]);
843 name_prefix[1] = XrmStringToName ("keysym"); 810 name_prefix[1] = XrmStringToName ("keysym");
… …
847 class_prefix[2] = NULLQUARK; 814 class_prefix[2] = NULLQUARK;
848 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 815 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
849 XrmEnumerateDatabase (database, name_prefix, class_prefix, 816 XrmEnumerateDatabase (database, name_prefix, class_prefix,
850 XrmEnumOneLevel, rxvt_define_key, NULL); 817 XrmEnumOneLevel, rxvt_define_key, NULL);
851# ifdef RESFALLBACK 818# ifdef RESFALLBACK
852 name_prefix[0] = XrmStringToName (RESFALLBACK);
853 name_prefix[1] = XrmStringToName ("keysym");
854 class_prefix[0] = XrmStringToName (RESFALLBACK); 819 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
855 class_prefix[1] = XrmStringToName ("Keysym");
856 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
857 XrmEnumerateDatabase (database, name_prefix, class_prefix, 821 XrmEnumerateDatabase (database, name_prefix, class_prefix,
858 XrmEnumOneLevel, rxvt_define_key, NULL); 822 XrmEnumOneLevel, rxvt_define_key, NULL);
859# endif 823# endif
860# endif 824# endif
861 825
862#endif /* NO_RESOURCES */ 826#endif /* NO_RESOURCES */
863} 827}
864 828
865/*----------------------- end-of-file (C source) -----------------------*/ 829/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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