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

Diff Legend

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