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

Diff Legend

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